--- Log opened Sat Dec 15 00:00:49 2018 20181215 00:45:47-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20181215 01:20:38-!- celmin|away is now known as celticminstrel 20181215 01:49:21<+wesdiscordbot> hmm, I kinda like the idea of preferences sharing between version. it is so annoying to remap the hotkeys and all the other little changes every time you install a new version. 20181215 01:49:58<+wesdiscordbot> I guess, the problem would be if an old version writes the file and gets rid of some of your prefs 20181215 01:50:35<+wesdiscordbot> That's the issue on (non-Debian/non-stock) Linux atm, since unlike Windows the preferences are shared there 20181215 01:51:33<+wesdiscordbot> yeah, and it's not like we can update those old versions to not do that 20181215 02:18:56< irker878> wesnoth/wesnoth:master newfrenchy83 1dbf872bff Update unit.hpp AppVeyor: 1/4 builds failed 20181215 02:18:57< irker878> Details vs2015/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/21021947 20181215 03:09:40<+wesdiscordbot> after all these years I'm coding in c++ again. now I understand what all that weird std::move business was about 20181215 03:12:21<+wesdiscordbot> but at work we have vs2013 so I can't use constexpr yet 20181215 05:19:22-!- irker878 [~irker@wesnoth/umc-dev/bot/shikadibot] has quit [Quit: transmission timeout] 20181215 05:30:07-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 240 seconds] 20181215 06:07:06-!- irker622 [~irker@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev 20181215 06:07:06< irker622> wesnoth/wesnoth:master newfrenchy83 98ab5d4f34 Update unit.hpp AppVeyor: All builds passed 20181215 06:08:23-!- celticminstrel is now known as celmin|sleep 20181215 07:19:42<+wesdiscordbot> ugh, 2013 D: 20181215 07:19:49<+wesdiscordbot> a horrible VS version 20181215 07:20:44<+wesdiscordbot> you should upgrade to glorious VS 2017 20181215 07:21:30-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20181215 07:52:01< irker622> wesnoth/wesnoth:master newfrenchy83 b13c2cae2e Update aspect_attacks.cpp AppVeyor: All builds passed 20181215 07:55:58-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20181215 08:07:15-!- behalebabo [~behalebab@unaffiliated/behalebabo] has quit [Ping timeout: 264 seconds] 20181215 08:07:28-!- behalebabo [~behalebab@unaffiliated/behalebabo] has joined #wesnoth-dev 20181215 09:59:30-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20181215 10:22:35-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20181215 10:52:24-!- irker622 [~irker@wesnoth/umc-dev/bot/shikadibot] has quit [Quit: transmission timeout] 20181215 11:13:32<+wesdiscordbot> @sapient_n3t , just copy the preferences file to wherever the new wesnoth looks for it then? 20181215 11:30:03-!- buhman [~rewt@c-73-162-194-50.hsd1.ca.comcast.net] has quit [Ping timeout: 252 seconds] 20181215 11:30:51-!- buhman [~rewt@c-73-162-194-50.hsd1.ca.comcast.net] has joined #wesnoth-dev 20181215 13:38:49-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20181215 14:54:01-!- celmin|sleep is now known as celticminstrel 20181215 15:21:44-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20181215 15:50:48-!- irker223 [~irker@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev 20181215 15:50:48< irker223> wesnoth: josteph wesnoth:master cffc8d75641b / .editorconfig: Add .editorconfig file to have automatic indentation https://github.com/wesnoth/wesnoth/commit/cffc8d75641b69b14e5a09c094d8f48a7a435c24 20181215 15:51:00< irker223> wesnoth: josteph wesnoth:1.14 87f31f06ac7c / .editorconfig: Add .editorconfig file to have automatic indentation https://github.com/wesnoth/wesnoth/commit/87f31f06ac7c39a1ce4e23dbd2ce40611794b5e2 20181215 15:51:46< irker223> wesnoth: nemaara wesnoth:master 852523eab26d / data/campaigns/The_South_Guard/maps/01_Born_to_the_Banner.map: TSG S1: updated map https://github.com/wesnoth/wesnoth/commit/852523eab26d99cacf11e4679e91f0b659a19fa4 20181215 15:51:48< irker223> wesnoth: nemaara wesnoth:master eccbcd8fe470 / data/campaigns/The_South_Guard/maps/02_Proven_by_the_Sword.map: TSG S2: updated map https://github.com/wesnoth/wesnoth/commit/eccbcd8fe470657986c807ce3969b80d712c9f88 20181215 15:51:50< irker223> wesnoth: nemaara wesnoth:master 7754d0c9cdc6 / data/campaigns/The_South_Guard/maps/03_A_Desperate_Errand.map: TSG S3: updated map https://github.com/wesnoth/wesnoth/commit/7754d0c9cdc634b9e0ae84808cb634068a6a61de 20181215 15:51:52< irker223> wesnoth: nemaara wesnoth:master fc91de550fa6 / data/campaigns/The_South_Guard/maps/04_Vale_of_Tears.map: TSG S4: updated map https://github.com/wesnoth/wesnoth/commit/fc91de550fa621bc3adf755a19ac645ec80032e6 20181215 15:51:54< irker223> wesnoth: nemaara wesnoth:master a96b3e29d6dd / data/campaigns/The_South_Guard/maps/04_Vale_of_Tears.map: TSG S4: updated map https://github.com/wesnoth/wesnoth/commit/a96b3e29d6dd3878df48253da4515a6a090083a4 20181215 15:51:56< irker223> wesnoth: nemaara wesnoth:master b23a0be3adac / data/campaigns/The_South_Guard/maps/06a_Tidings_Good_and_Ill.map: TSG S6a: updated map https://github.com/wesnoth/wesnoth/commit/b23a0be3adac8ba520f8566f509d3e7b02fcc9ee 20181215 15:51:58< irker223> wesnoth: nemaara wesnoth:master 92070efc90d0 / data/campaigns/The_South_Guard/maps/01_Born_to_the_Banner.map: TSG S1: updated map https://github.com/wesnoth/wesnoth/commit/92070efc90d029d54bdf4b11c9261a004bf66d3f 20181215 15:52:00< irker223> wesnoth: nemaara wesnoth:master aac955b9058e / data/campaigns/The_South_Guard/maps/02_Proven_by_the_Sword.map: TSG S2: updated map https://github.com/wesnoth/wesnoth/commit/aac955b9058e0090079a379c3e08bad138249169 20181215 15:52:02< irker223> wesnoth: nemaara wesnoth:master 86928a5087a3 / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: updated gameplay https://github.com/wesnoth/wesnoth/commit/86928a5087a3dbd3d1306dc320caed3ea24ed04f 20181215 15:52:04< irker223> wesnoth: nemaara wesnoth:master 805778345782 / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: updated gameplay https://github.com/wesnoth/wesnoth/commit/805778345782a6823f49b9aa1a6062af1ceb045d 20181215 15:52:06< irker223> wesnoth: nemaara wesnoth:master fd322e0ae4bb / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: changed scenario music https://github.com/wesnoth/wesnoth/commit/fd322e0ae4bbe2d89439850592ccf8d8e59b7aa4 20181215 15:52:08< irker223> wesnoth: nemaara wesnoth:master 8b147239b8ea / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: gameplay update https://github.com/wesnoth/wesnoth/commit/8b147239b8ead1551973e179029d9736c2486d46 20181215 15:52:10< irker223> wesnoth: nemaara wesnoth:master b1d906d2646e / data/campaigns/The_South_Guard/maps/03_A_Desperate_Errand.map: TSG S3: updated map https://github.com/wesnoth/wesnoth/commit/b1d906d2646e27e0a0438f23e71122b89341c70f 20181215 15:52:12< irker223> wesnoth: nemaara wesnoth:master 456e3a3b224d / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: added scenario music https://github.com/wesnoth/wesnoth/commit/456e3a3b224dfff1d051c77c1af553cc4b3dcac1 20181215 15:52:14< irker223> wesnoth: nemaara wesnoth:master ca7df6875481 / data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg: TSG S4: gameplay update https://github.com/wesnoth/wesnoth/commit/ca7df6875481d3252f1a5ad72f479af51a1276a7 20181215 15:52:16< irker223> wesnoth: nemaara wesnoth:master df2902a940c5 / data/campaigns/The_South_Guard/maps/04_Vale_of_Tears.map: TSG S4: updated map https://github.com/wesnoth/wesnoth/commit/df2902a940c5bc9d49fe9a52d97c9452cc9acc4a 20181215 15:52:18< irker223> wesnoth: nemaara wesnoth:master ae416567d58c / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: gameplay update https://github.com/wesnoth/wesnoth/commit/ae416567d58c64405e194471e3550d7b0d8e0307 20181215 15:52:20< irker223> wesnoth: nemaara wesnoth:master d2f4c7de5e80 / data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map: TSG S5: updated map https://github.com/wesnoth/wesnoth/commit/d2f4c7de5e808fa9adf2f439d505fa9a2cb5589a 20181215 15:52:22< irker223> wesnoth: nemaara wesnoth:master 516cfe4e7872 / data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map: TSG S5: updated map to fall terrain https://github.com/wesnoth/wesnoth/commit/516cfe4e78729ec2e0bd6a8505afa5ff83c6a87b 20181215 15:52:24< irker223> wesnoth: nemaara wesnoth:master cdaaeb31bf89 / data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map: TSG S5: updated map to fall terrain https://github.com/wesnoth/wesnoth/commit/cdaaeb31bf897726a009447d1ab626ab02bbfa67 20181215 15:52:26< irker223> wesnoth: nemaara wesnoth:master c9f85d54041a / data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg: TSG S6b: gameplay update https://github.com/wesnoth/wesnoth/commit/c9f85d54041a633989300cedb0a54ce0224962fe 20181215 15:52:28< irker223> wesnoth: nemaara wesnoth:master b223bcfe8990 / data/campaigns/The_South_Guard/maps/06b_The_Long_March.map: TSG S6b: updated map https://github.com/wesnoth/wesnoth/commit/b223bcfe89907a2e25d2ca54983d922212d3b7ff 20181215 15:52:30< irker223> wesnoth: nemaara wesnoth:master 376e92c1d5cc / data/campaigns/The_South_Guard/maps/07b_Pebbles_in_the_Flood.map: TSG S7b: updated map https://github.com/wesnoth/wesnoth/commit/376e92c1d5cc9835dec6c99484a9f72f09500072 20181215 15:52:32< irker223> wesnoth: nemaara wesnoth:master d4b39ae7c851 / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: gameplay update https://github.com/wesnoth/wesnoth/commit/d4b39ae7c8513fa427cb3049e3b0125e4a17614e 20181215 15:52:34< irker223> wesnoth: nemaara wesnoth:master 9d38d7ce06a2 / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: reduced enemy gold https://github.com/wesnoth/wesnoth/commit/9d38d7ce06a29c52a7f0948a0cad244e732751b3 20181215 15:52:36< irker223> wesnoth: nemaara wesnoth:master f4edc8fd3565 / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: dialogue and event changes https://github.com/wesnoth/wesnoth/commit/f4edc8fd356509fc4a9505f740e46434a4d5e1cf 20181215 15:52:38< irker223> wesnoth: nemaara wesnoth:master 5fd614d4b04f / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: added dialogue for Ithelden https://github.com/wesnoth/wesnoth/commit/5fd614d4b04fbd36ede9c82ec137d595c1605d3e 20181215 15:52:40< irker223> wesnoth: nemaara wesnoth:master 25124cbdd3a8 / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: adjusted gold values https://github.com/wesnoth/wesnoth/commit/25124cbdd3a8e3107ce3d245b87f67240751f01c 20181215 15:52:42< irker223> wesnoth: nemaara wesnoth:master 1cbabfbdbcac / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: gameplay revision https://github.com/wesnoth/wesnoth/commit/1cbabfbdbcacfae5ff6a97db46cec12ef086845b 20181215 15:52:44< irker223> wesnoth: nemaara wesnoth:master 873c233abfdd / data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map: TSG S8b: map revision https://github.com/wesnoth/wesnoth/commit/873c233abfdd882d82136bdad80ef741e3999f34 20181215 15:52:46< irker223> wesnoth: nemaara wesnoth:master 5e36025489cf / data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg: TSG S7a: gameplay update https://github.com/wesnoth/wesnoth/commit/5e36025489cf816de09aac4e2dcb69856f01f4bd 20181215 15:52:48< irker223> wesnoth: nemaara wesnoth:master 13ad0f134ea5 / data/campaigns/The_South_Guard/maps/07a_Into_the_Depths.map: TSG S7a: map revision https://github.com/wesnoth/wesnoth/commit/13ad0f134ea5f0581030212ecc1c4844b3d7a1be 20181215 15:52:50< irker223> wesnoth: nemaara wesnoth:master f0e014223b0b / data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg: TSG S6b: modified enemy spawns https://github.com/wesnoth/wesnoth/commit/f0e014223b0b72c38fd349d12498fcd155f14e4f 20181215 15:52:52< irker223> wesnoth: nemaara wesnoth:master 2c6e16e7fa87 / data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg: TSG S7a: gameplay update https://github.com/wesnoth/wesnoth/commit/2c6e16e7fa87b4f6305b189cbcb841407e74bf31 20181215 15:52:54< irker223> wesnoth: nemaara wesnoth:master bb79a6955171 / data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg: TSG S8a: updated gameplay https://github.com/wesnoth/wesnoth/commit/bb79a69551711b9a0eca8f0c68ae55c1a8421f7a 20181215 15:52:56< irker223> wesnoth: nemaara wesnoth:master 8c7a619faa97 / data/campaigns/The_South_Guard/maps/08a_Return_to_Kerlath.map: TSG S8a: map revision https://github.com/wesnoth/wesnoth/commit/8c7a619faa9705720fa1bd6cae67d1bb98ed4304 20181215 15:52:58< irker223> wesnoth: nemaara wesnoth:master 24d68e291032 / data/campaigns/The_South_Guard/utils/sg_deaths.cfg: TSG modified hero deaths https://github.com/wesnoth/wesnoth/commit/24d68e291032e839a4e790b9b1452a1611b16617 20181215 15:53:00< irker223> wesnoth: nemaara wesnoth:master eb65dd3aacd8 / data/campaigns/The_South_Guard/utils/sg_deaths.cfg: TSG modified hero deaths https://github.com/wesnoth/wesnoth/commit/eb65dd3aacd87c6138833bbc5fb6d3cb7bdb86cd 20181215 15:53:02< irker223> wesnoth: nemaara wesnoth:master 997db6c4022c / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: code style modifications https://github.com/wesnoth/wesnoth/commit/997db6c4022c74d9b881fcf256fce22cab9c5c40 20181215 15:53:04< irker223> wesnoth: nemaara wesnoth:master d15b4ea018f7 / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: fixed po translation note https://github.com/wesnoth/wesnoth/commit/d15b4ea018f77dfd8d01a1e07c3918ce5ee55e45 20181215 15:53:06< irker223> wesnoth: nemaara wesnoth:master 23c63c8f507a / data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg: TSG S9a: gameplay update https://github.com/wesnoth/wesnoth/commit/23c63c8f507ad6ca7f414b75fdab938945e57d68 20181215 15:53:08< irker223> wesnoth: nemaara wesnoth:master b36291f2b8dc / data/campaigns/The_South_Guard/maps/09a_Vengeance.map: TSG S9a: map revision https://github.com/wesnoth/wesnoth/commit/b36291f2b8dcfebba493b5dcae3423845a844cd0 20181215 15:53:10< irker223> wesnoth: nemaara wesnoth:master f1297af94251 / data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg: TSG S8a: added time over event https://github.com/wesnoth/wesnoth/commit/f1297af94251f97c151fc8f400c50da7acd68406 20181215 15:53:12< irker223> wesnoth: nemaara wesnoth:master 12ae1f75715e / data/campaigns/The_South_Guard/utils/bigmap.cfg: TSG bigmap: modified S8a/S9a https://github.com/wesnoth/wesnoth/commit/12ae1f75715e9e095afa81fc93a06ab797ecf1d8 20181215 15:53:14< irker223> wesnoth: nemaara wesnoth:master 88210deef218 / data/campaigns/The_South_Guard/utils/sg_help.cfg: TSG help: modified enemy unit descriptions https://github.com/wesnoth/wesnoth/commit/88210deef218d92eb06a4c9782115bc92331c1f0 20181215 15:53:16< irker223> wesnoth: nemaara wesnoth:master 7ef09418cf4b / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: adjusted enemy income https://github.com/wesnoth/wesnoth/commit/7ef09418cf4b70b2c7707e3f697621ed591d372a 20181215 15:53:18< irker223> wesnoth: nemaara wesnoth:master 03d3da9bbc63 / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: fixed typo https://github.com/wesnoth/wesnoth/commit/03d3da9bbc637e8e9e245be750134baccc9ef3cf 20181215 15:53:20< irker223> wesnoth: nemaara wesnoth:master d993c5f63782 / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: fixed typo https://github.com/wesnoth/wesnoth/commit/d993c5f637820607599d57b977c3455361ae446d 20181215 15:53:22< irker223> wesnoth: nemaara wesnoth:master 9a214f3d00f8 / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: reduced enemy income https://github.com/wesnoth/wesnoth/commit/9a214f3d00f82f9047b66ae0194c234137dd6f2e 20181215 15:53:24< irker223> wesnoth: nemaara wesnoth:master d959e648f238 / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: fixed Ethiliel upkeep bug https://github.com/wesnoth/wesnoth/commit/d959e648f2387c2cf4de768b9c6f31c37dd71885 20181215 15:53:26< irker223> wesnoth: nemaara wesnoth:master c2e7535eed97 / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: fixed Ethiliel upkeep bug https://github.com/wesnoth/wesnoth/commit/c2e7535eed978c456579e4573aeedae29ed39151 20181215 15:53:28< irker223> wesnoth: nemaara wesnoth:master 965246e10b7f / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: modified starting village captures https://github.com/wesnoth/wesnoth/commit/965246e10b7fcbfef4bcf89a7ab8c2473f5acd98 20181215 15:53:30< irker223> wesnoth: nemaara wesnoth:master fbb1cd5bbdcb / data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg: TSG S9a: fixed no unit spawn bug https://github.com/wesnoth/wesnoth/commit/fbb1cd5bbdcb7e20697105d06811b14ccc9f54c0 20181215 15:53:32< irker223> wesnoth: nemaara wesnoth:master 2b268a261af4 / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: moved side 2 gold gain https://github.com/wesnoth/wesnoth/commit/2b268a261af42c3b6c5e86c4a68040e9a16ee0b1 20181215 15:53:34< irker223> wesnoth: nemaara wesnoth:master 25dfa0118104 / data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg: TSG S8a: fixed dialogue typos/bugs https://github.com/wesnoth/wesnoth/commit/25dfa0118104f66bd5cef1d996e92cb2eeca0cac 20181215 15:53:36< irker223> wesnoth: nemaara wesnoth:master 1853460bb869 / data/campaigns/The_South_Guard/utils/sg_story.cfg: TSG story text: fixed typos https://github.com/wesnoth/wesnoth/commit/1853460bb86939dbb43962ddaba9900a7300ea7f 20181215 15:53:38< irker223> wesnoth: nemaara wesnoth:master 94075c72cbfb / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: changed dialogue wording https://github.com/wesnoth/wesnoth/commit/94075c72cbfb77fcf11a4095fa1b8ab752af5737 20181215 15:53:40< irker223> wesnoth: nemaara wesnoth:master 014ec48ed4f4 / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: dialogue fix https://github.com/wesnoth/wesnoth/commit/014ec48ed4f49d5171feb1b07cf3bac28e762bc1 20181215 15:53:42< irker223> wesnoth: nemaara wesnoth:master 53452b70bc6e / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: fixed Urza Afalas upkeep bug https://github.com/wesnoth/wesnoth/commit/53452b70bc6e3a86b179addabb39a69890921781 20181215 15:53:44< irker223> wesnoth: nemaara wesnoth:master 27953ca669f6 / data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg: TSG S6b: minor QOL tweaks https://github.com/wesnoth/wesnoth/commit/27953ca669f622d6742378d26d6bedc909d6b913 20181215 15:53:46< irker223> wesnoth: nemaara wesnoth:master 07e06cf5e535 / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: adjusted side 2 starting gold https://github.com/wesnoth/wesnoth/commit/07e06cf5e535fd818ccd6a2b54f3a6c4a6f35d21 20181215 15:53:48< irker223> wesnoth: nemaara wesnoth:master f378649b2d1f / data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map: TSG S8b: reduced side 2,3 castle sizes https://github.com/wesnoth/wesnoth/commit/f378649b2d1f6bcbac487bd1a56b99c03c2d4cab 20181215 15:53:50< irker223> wesnoth: nemaara wesnoth:master 0225c5a04f1a / data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map: TSG S8b: increased player castle size https://github.com/wesnoth/wesnoth/commit/0225c5a04f1a05a99d179ed0cfc0b4a081e8324e 20181215 15:53:52< irker223> wesnoth: nemaara wesnoth:master 0757445eee66 / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: adjusted enemy gold https://github.com/wesnoth/wesnoth/commit/0757445eee6613503a48b2739534f74df096c5a6 20181215 15:53:54< irker223> wesnoth: nemaara wesnoth:master e8927acb8a58 / data/campaigns/The_South_Guard/utils/sg_deaths.cfg: TSG: modified Hylas' death https://github.com/wesnoth/wesnoth/commit/e8927acb8a58c857c85e2f92607e65513beffcdd 20181215 15:55:32-!- travis-ci [~travis-ci@ec2-54-159-250-182.compute-1.amazonaws.com] has joined #wesnoth-dev 20181215 15:55:33< travis-ci> wesnoth/wesnoth#20394 (master - cffc8d7 : josteph): The build has errored. 20181215 15:55:33< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/468429725 20181215 15:55:33-!- travis-ci [~travis-ci@ec2-54-159-250-182.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181215 15:56:24<+wesdiscordbot> The command "git checkout -qf cffc8d75641b69b14e5a09c094d8f48a7a435c24" failed and exited with 128 during . 20181215 15:56:50<+wesdiscordbot> "fatal: reference is not a tree: cffc8d75641b69b14e5a09c094d8f48a7a435c24" 20181215 15:57:09<+wesdiscordbot> it's a commit 20181215 15:57:12<+wesdiscordbot> so it's a treeish 20181215 15:58:04<+wesdiscordbot> https://stackoverflow.com/questions/13425298/git-submodule-update-fatal-error-reference-is-not-a-tree 20181215 15:58:34<+wesdiscordbot> According to this Stack Overflow discussion, the error can occur if the commit doesn't exist in the local repository. 20181215 15:58:55<+wesdiscordbot> Submodules are one possible cause, but my guess would be just badly timed force-push. 20181215 15:59:06<+wesdiscordbot> Erasing the commit before Travis can check it out. 20181215 15:59:08<+wesdiscordbot> I did a regular push, not a forced one 20181215 15:59:10<+wesdiscordbot> @Pentarctagon ? 20181215 15:59:28<+wesdiscordbot> github said it merged cleanly 20181215 15:59:38<+wesdiscordbot> all I did was click the rebase and merge button 20181215 15:59:50<+wesdiscordbot> wars have begun this way 20181215 16:00:25<+wesdiscordbot> (that was supposed to be a joke) 20181215 16:00:34<+wesdiscordbot> anyway, just did a fetch, and origin/master still contains my commit 20181215 16:00:45<+wesdiscordbot> let's way to see if travis likes the TSG push, I guess? 20181215 16:02:16< smiley`> you guys should really use matrix to bridge irc and discord. 20181215 16:02:22<+wesdiscordbot> I canceled the editorconfig 1.14 build, so we'll see 20181215 16:04:12<+wesdiscordbot> smiley`: @loonycyborg has mentioned it a few times. I don't know if anyone else here really knows much about it. 20181215 16:05:27<+wesdiscordbot> matrix is very new yet, could eventually be a proper replacement for irc 20181215 16:05:42< smiley`> Me neither. Apart from the fact that it exists.. 20181215 16:05:59<+wesdiscordbot> once desktop clients catch up to their web client 😛 20181215 16:06:20<+wesdiscordbot> for now all clients that aren't riot are pretty limited 20181215 16:06:46<+wesdiscordbot> and the main server, synapse, is written in python. There's rust implementation in the works too 20181215 16:07:11<+wesdiscordbot> A more scalable server would be very necessary 20181215 16:21:48< irker223> wesnoth: nemaara wesnoth:1.14 7904620a80bd / data/campaigns/The_South_Guard/maps/01_Born_to_the_Banner.map: TSG S1: updated map https://github.com/wesnoth/wesnoth/commit/7904620a80bd19fbf25d783ca3c7af822753195f 20181215 16:21:50< irker223> wesnoth: nemaara wesnoth:1.14 c68653ff0e24 / data/campaigns/The_South_Guard/maps/02_Proven_by_the_Sword.map: TSG S2: updated map https://github.com/wesnoth/wesnoth/commit/c68653ff0e24bdcfb2f546c11ce48f7ccd61ee43 20181215 16:21:52< irker223> wesnoth: nemaara wesnoth:1.14 dba995aa28d9 / data/campaigns/The_South_Guard/maps/03_A_Desperate_Errand.map: TSG S3: updated map https://github.com/wesnoth/wesnoth/commit/dba995aa28d9dc04437c961e1aeb97fc22a0fc90 20181215 16:21:54< irker223> wesnoth: nemaara wesnoth:1.14 b5b346d28148 / data/campaigns/The_South_Guard/maps/04_Vale_of_Tears.map: TSG S4: updated map https://github.com/wesnoth/wesnoth/commit/b5b346d28148478e8ff6c19fcc530e09c3619dce 20181215 16:21:56< irker223> wesnoth: nemaara wesnoth:1.14 f9b31d725e8d / data/campaigns/The_South_Guard/maps/04_Vale_of_Tears.map: TSG S4: updated map https://github.com/wesnoth/wesnoth/commit/f9b31d725e8d51533324a71427586e7c54cb4424 20181215 16:21:58< irker223> wesnoth: nemaara wesnoth:1.14 57ba94700cc1 / data/campaigns/The_South_Guard/maps/06a_Tidings_Good_and_Ill.map: TSG S6a: updated map https://github.com/wesnoth/wesnoth/commit/57ba94700cc10955a6a699cfced3a03030afcdb8 20181215 16:22:00< irker223> wesnoth: nemaara wesnoth:1.14 748e97bc21c9 / data/campaigns/The_South_Guard/maps/01_Born_to_the_Banner.map: TSG S1: updated map https://github.com/wesnoth/wesnoth/commit/748e97bc21c9413eac51703ad04cdf3c822d51ee 20181215 16:22:02< irker223> wesnoth: nemaara wesnoth:1.14 b57c2a41b794 / data/campaigns/The_South_Guard/maps/02_Proven_by_the_Sword.map: TSG S2: updated map https://github.com/wesnoth/wesnoth/commit/b57c2a41b794f05591cd959fab7be9b96ea11d67 20181215 16:22:04< irker223> wesnoth: nemaara wesnoth:1.14 ff2364820eea / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: updated gameplay https://github.com/wesnoth/wesnoth/commit/ff2364820eeafe0bac9bab7b73eb389fc5ed49de 20181215 16:22:06< irker223> wesnoth: nemaara wesnoth:1.14 a970b0e2f5fe / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: updated gameplay https://github.com/wesnoth/wesnoth/commit/a970b0e2f5fe31afffc84ca0cd76145e0da270c0 20181215 16:22:08< irker223> wesnoth: nemaara wesnoth:1.14 2aeee0fa9baa / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: changed scenario music https://github.com/wesnoth/wesnoth/commit/2aeee0fa9baa7360303313508f0eabf94e7dcff8 20181215 16:22:10< irker223> wesnoth: nemaara wesnoth:1.14 24ac6a83b225 / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: gameplay update https://github.com/wesnoth/wesnoth/commit/24ac6a83b225f944ade58ffe098a708c4e4622d0 20181215 16:22:12< irker223> wesnoth: nemaara wesnoth:1.14 a5c58a6c9da6 / data/campaigns/The_South_Guard/maps/03_A_Desperate_Errand.map: TSG S3: updated map https://github.com/wesnoth/wesnoth/commit/a5c58a6c9da688ad41ab6c48581183435cffdfb4 20181215 16:22:14< irker223> wesnoth: nemaara wesnoth:1.14 8edcc84ce68a / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: added scenario music https://github.com/wesnoth/wesnoth/commit/8edcc84ce68a9ec761f49e7817ed7f71545a49f6 20181215 16:22:16< irker223> wesnoth: nemaara wesnoth:1.14 1ee705a00988 / data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg: TSG S4: gameplay update https://github.com/wesnoth/wesnoth/commit/1ee705a009886645cbf1c1bee3e5453fc915c32f 20181215 16:22:18< irker223> wesnoth: nemaara wesnoth:1.14 c4d8c6a72caf / data/campaigns/The_South_Guard/maps/04_Vale_of_Tears.map: TSG S4: updated map https://github.com/wesnoth/wesnoth/commit/c4d8c6a72caf0b44f383c9e3fee79d3163eae30a 20181215 16:22:20< irker223> wesnoth: nemaara wesnoth:1.14 5e943cb7c9d6 / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: gameplay update https://github.com/wesnoth/wesnoth/commit/5e943cb7c9d6925d994a92b46432f2126ebd6760 20181215 16:22:22< irker223> wesnoth: nemaara wesnoth:1.14 018e5827a410 / data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map: TSG S5: updated map https://github.com/wesnoth/wesnoth/commit/018e5827a410d6edfeb5d9cc904e3100dd3f9dde 20181215 16:22:24< irker223> wesnoth: nemaara wesnoth:1.14 1d4e6bb3c0b6 / data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map: TSG S5: updated map to fall terrain https://github.com/wesnoth/wesnoth/commit/1d4e6bb3c0b662b147a3048407247ba1efb729a1 20181215 16:22:26< irker223> wesnoth: nemaara wesnoth:1.14 765d1008364e / data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map: TSG S5: updated map to fall terrain https://github.com/wesnoth/wesnoth/commit/765d1008364ef4f20d5615b897efada0ffc02366 20181215 16:22:28< irker223> wesnoth: nemaara wesnoth:1.14 9c4a5795dda4 / data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg: TSG S6b: gameplay update https://github.com/wesnoth/wesnoth/commit/9c4a5795dda4738e8b6c6bf80530ec388f749ac9 20181215 16:22:30< irker223> wesnoth: nemaara wesnoth:1.14 73ea511ea827 / data/campaigns/The_South_Guard/maps/06b_The_Long_March.map: TSG S6b: updated map https://github.com/wesnoth/wesnoth/commit/73ea511ea827e1c03f08ecc56d93da6874ffaa39 20181215 16:22:32< irker223> wesnoth: nemaara wesnoth:1.14 2f93576550a2 / data/campaigns/The_South_Guard/maps/07b_Pebbles_in_the_Flood.map: TSG S7b: updated map https://github.com/wesnoth/wesnoth/commit/2f93576550a2a726057617006eb3ff629a41624a 20181215 16:22:34< irker223> wesnoth: nemaara wesnoth:1.14 aa5914eadd27 / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: gameplay update https://github.com/wesnoth/wesnoth/commit/aa5914eadd2761626a2ecf846a454cea4d3ab545 20181215 16:22:36< irker223> wesnoth: nemaara wesnoth:1.14 ad591947484c / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: reduced enemy gold https://github.com/wesnoth/wesnoth/commit/ad591947484c8dfafd11006b2d3cc24655e09ad3 20181215 16:22:38< irker223> wesnoth: nemaara wesnoth:1.14 397db962ae2b / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: dialogue and event changes https://github.com/wesnoth/wesnoth/commit/397db962ae2be5ea484d789f1e0973819378416b 20181215 16:22:40< irker223> wesnoth: nemaara wesnoth:1.14 44f18fac5d96 / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: added dialogue for Ithelden https://github.com/wesnoth/wesnoth/commit/44f18fac5d9674ab9619f47223f39a1422f173f2 20181215 16:22:42< irker223> wesnoth: nemaara wesnoth:1.14 97b6ccb67d6d / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: adjusted gold values https://github.com/wesnoth/wesnoth/commit/97b6ccb67d6da510ec89f5ec06fa89541889bf14 20181215 16:22:44< irker223> wesnoth: nemaara wesnoth:1.14 964e3258a1ff / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: gameplay revision https://github.com/wesnoth/wesnoth/commit/964e3258a1ff6f3cc2c14dc6148a260575cc3b97 20181215 16:22:46< irker223> wesnoth: nemaara wesnoth:1.14 d45f433e6b82 / data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map: TSG S8b: map revision https://github.com/wesnoth/wesnoth/commit/d45f433e6b8238121de44c74c2420b66b6cdce35 20181215 16:22:48< irker223> wesnoth: nemaara wesnoth:1.14 b02390800563 / data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg: TSG S7a: gameplay update https://github.com/wesnoth/wesnoth/commit/b02390800563462761fbffb243e12fc5713c8ae7 20181215 16:22:50< irker223> wesnoth: nemaara wesnoth:1.14 ca2687d1464a / data/campaigns/The_South_Guard/maps/07a_Into_the_Depths.map: TSG S7a: map revision https://github.com/wesnoth/wesnoth/commit/ca2687d1464ad5c973baa12175cde71229197e21 20181215 16:22:52< irker223> wesnoth: nemaara wesnoth:1.14 bbea1767a48c / data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg: TSG S6b: modified enemy spawns https://github.com/wesnoth/wesnoth/commit/bbea1767a48c75759196331ce51428bad9bcf7eb 20181215 16:22:54< irker223> wesnoth: nemaara wesnoth:1.14 bfd7d5b7f1f2 / data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg: TSG S7a: gameplay update https://github.com/wesnoth/wesnoth/commit/bfd7d5b7f1f2d14088228dc6b3fcc5de1d28076d 20181215 16:22:56< irker223> wesnoth: nemaara wesnoth:1.14 c3a227a6e667 / data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg: TSG S8a: updated gameplay https://github.com/wesnoth/wesnoth/commit/c3a227a6e667261fadd76337b3576bc774e328da 20181215 16:22:58< irker223> wesnoth: nemaara wesnoth:1.14 d3c8b9fdadaa / data/campaigns/The_South_Guard/maps/08a_Return_to_Kerlath.map: TSG S8a: map revision https://github.com/wesnoth/wesnoth/commit/d3c8b9fdadaa55d4e4d456eb2d96d149c0c3b597 20181215 16:23:00< irker223> wesnoth: nemaara wesnoth:1.14 2d336162f1d4 / data/campaigns/The_South_Guard/utils/sg_deaths.cfg: TSG modified hero deaths https://github.com/wesnoth/wesnoth/commit/2d336162f1d4d35a7fb4518c1367b13dc468de77 20181215 16:23:02< irker223> wesnoth: nemaara wesnoth:1.14 fd71a0f8ce85 / data/campaigns/The_South_Guard/utils/sg_deaths.cfg: TSG modified hero deaths https://github.com/wesnoth/wesnoth/commit/fd71a0f8ce85083fa7bf07921e80688e87b8469f 20181215 16:23:04< irker223> wesnoth: nemaara wesnoth:1.14 f391108eb813 / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: code style modifications https://github.com/wesnoth/wesnoth/commit/f391108eb8137a379abf55cb4e041908d891f4a9 20181215 16:23:06< irker223> wesnoth: nemaara wesnoth:1.14 d67c18948a4c / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: fixed po translation note https://github.com/wesnoth/wesnoth/commit/d67c18948a4c4d9eda2597b97b5eaad75fc75848 20181215 16:23:08< irker223> wesnoth: nemaara wesnoth:1.14 11d7da26f7c9 / data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg: TSG S9a: gameplay update https://github.com/wesnoth/wesnoth/commit/11d7da26f7c93e5dce94860bee5c150a8444352d 20181215 16:23:10< irker223> wesnoth: nemaara wesnoth:1.14 ddb39e789f0c / data/campaigns/The_South_Guard/maps/09a_Vengeance.map: TSG S9a: map revision https://github.com/wesnoth/wesnoth/commit/ddb39e789f0caaffc1a39a10664e1fa928c60c2b 20181215 16:23:12< irker223> wesnoth: nemaara wesnoth:1.14 2b7f3feb3e07 / data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg: TSG S8a: added time over event https://github.com/wesnoth/wesnoth/commit/2b7f3feb3e0701192995d06be47905cb47cff3a3 20181215 16:23:14< irker223> wesnoth: nemaara wesnoth:1.14 c499d921ffbd / data/campaigns/The_South_Guard/utils/bigmap.cfg: TSG bigmap: modified S8a/S9a https://github.com/wesnoth/wesnoth/commit/c499d921ffbd66636bb9c4e0a02a1c8e70c73023 20181215 16:23:16< irker223> wesnoth: nemaara wesnoth:1.14 154abbf04d33 / data/campaigns/The_South_Guard/utils/sg_help.cfg: TSG help: modified enemy unit descriptions https://github.com/wesnoth/wesnoth/commit/154abbf04d3346187a698bd5ac8cc5929b05a13d 20181215 16:23:18< irker223> wesnoth: nemaara wesnoth:1.14 2af17a407f1e / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: adjusted enemy income https://github.com/wesnoth/wesnoth/commit/2af17a407f1e2c5ff356f6beeae684cb149083d6 20181215 16:23:20< irker223> wesnoth: nemaara wesnoth:1.14 406a50086140 / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: fixed typo https://github.com/wesnoth/wesnoth/commit/406a500861402f99c009c40775cfc232ad92ccae 20181215 16:23:22< irker223> wesnoth: nemaara wesnoth:1.14 8a873c3cb219 / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: fixed typo https://github.com/wesnoth/wesnoth/commit/8a873c3cb219ed17f04c5864cc032d77549f93bd 20181215 16:23:24< irker223> wesnoth: nemaara wesnoth:1.14 1997dc93da4d / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: reduced enemy income https://github.com/wesnoth/wesnoth/commit/1997dc93da4dfecbbc7320b875448f9727e9afd5 20181215 16:23:26< irker223> wesnoth: nemaara wesnoth:1.14 4f9ddfe70442 / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: fixed Ethiliel upkeep bug https://github.com/wesnoth/wesnoth/commit/4f9ddfe704428fd16bca576e7973715c2f5e5d02 20181215 16:23:28< irker223> wesnoth: nemaara wesnoth:1.14 5f9361d781ac / data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg: TSG S3: fixed Ethiliel upkeep bug https://github.com/wesnoth/wesnoth/commit/5f9361d781ace6ee4f3c4356cc4169ac5e1d2051 20181215 16:23:30< irker223> wesnoth: nemaara wesnoth:1.14 c40e908aa456 / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: modified starting village captures https://github.com/wesnoth/wesnoth/commit/c40e908aa4563d32dbe184dd4964b71f8e2020f0 20181215 16:23:32< irker223> wesnoth: nemaara wesnoth:1.14 65af6d74729e / data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg: TSG S9a: fixed no unit spawn bug https://github.com/wesnoth/wesnoth/commit/65af6d74729e157aa628a9e8ec6359d927b952f7 20181215 16:23:34< irker223> wesnoth: nemaara wesnoth:1.14 7fbaed083d58 / data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg: TSG S1: moved side 2 gold gain https://github.com/wesnoth/wesnoth/commit/7fbaed083d583ad2d1428e30fe2d1ba9211468c6 20181215 16:23:36< irker223> wesnoth: nemaara wesnoth:1.14 cb346cd47a90 / data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg: TSG S8a: fixed dialogue typos/bugs https://github.com/wesnoth/wesnoth/commit/cb346cd47a90da1653dd2486c0c595ee04ca140d 20181215 16:23:38< irker223> wesnoth: nemaara wesnoth:1.14 db23a4d2bcfc / data/campaigns/The_South_Guard/utils/sg_story.cfg: TSG story text: fixed typos https://github.com/wesnoth/wesnoth/commit/db23a4d2bcfcaabc55f7ea5925545f1213229cd1 20181215 16:23:40< irker223> wesnoth: nemaara wesnoth:1.14 e7b7a7450409 / data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg: TSG S2: changed dialogue wording https://github.com/wesnoth/wesnoth/commit/e7b7a74504099fe191758b3929d8029bbb32c221 20181215 16:23:42< irker223> wesnoth: nemaara wesnoth:1.14 526529e93453 / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: dialogue fix https://github.com/wesnoth/wesnoth/commit/526529e93453364b000eab7a72878300da4d51c9 20181215 16:23:44< irker223> wesnoth: nemaara wesnoth:1.14 447706ce744b / data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg: TSG S5: fixed Urza Afalas upkeep bug https://github.com/wesnoth/wesnoth/commit/447706ce744b2bd0711834c1239bce91f2c42035 20181215 16:23:46< irker223> wesnoth: nemaara wesnoth:1.14 539b440e1619 / data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg: TSG S6b: minor QOL tweaks https://github.com/wesnoth/wesnoth/commit/539b440e1619180acb1426577766fdc0e91ebb5b 20181215 16:23:48< irker223> wesnoth: nemaara wesnoth:1.14 76f47f3e8e21 / data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg: TSG S8b: adjusted side 2 starting gold https://github.com/wesnoth/wesnoth/commit/76f47f3e8e21b4c30b60e5c4b28e72aacf1932ee 20181215 16:23:50< irker223> wesnoth: nemaara wesnoth:1.14 af2492e31938 / data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map: TSG S8b: reduced side 2,3 castle sizes https://github.com/wesnoth/wesnoth/commit/af2492e3193848bc525fc136d3ac08f60056f705 20181215 16:23:52< irker223> wesnoth: nemaara wesnoth:1.14 cae0b4a2b916 / data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map: TSG S8b: increased player castle size https://github.com/wesnoth/wesnoth/commit/cae0b4a2b91697e134776994f2d46e8b6e9d9c43 20181215 16:23:54< irker223> wesnoth: nemaara wesnoth:1.14 740ba8ba2139 / data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg: TSG S7b: adjusted enemy gold https://github.com/wesnoth/wesnoth/commit/740ba8ba21392a39ab41688e673b441e46723e97 20181215 16:23:56< irker223> wesnoth: nemaara wesnoth:1.14 cd5a42ae6c46 / data/campaigns/The_South_Guard/utils/sg_deaths.cfg: TSG: modified Hylas' death https://github.com/wesnoth/wesnoth/commit/cd5a42ae6c465a1210eeb0c701630309b6d56959 20181215 16:24:45< irker223> wesnoth: mstrebel wesnoth:master d169d520207a / src/theme.cpp: Fix #3744: Changing theme twice (#3779) https://github.com/wesnoth/wesnoth/commit/d169d520207a4cddc86289b4d2e63d0b330cb0d8 20181215 16:26:34< irker223> wesnoth: mstrebel wesnoth:1.14 125e0e146103 / src/theme.cpp: Fix #3744: Changing theme twice (#3779) https://github.com/wesnoth/wesnoth/commit/125e0e1461038cb6b19b4683daa2c18edbcee20e 20181215 16:32:18-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20181215 16:35:11<+wesdiscordbot> travis seems happy so far 20181215 16:35:41<+wesdiscordbot> https://travis-ci.org/wesnoth/wesnoth/builds/468430075 20181215 17:17:16<+wesdiscordbot> think the TSG thingpentarctagon committed takes care of #3540 20181215 17:17:36<+wesdiscordbot> and most of #1954 20181215 17:17:42<+wesdiscordbot> @Konrad2 ^ 3782 20181215 17:19:41< irker223> wesnoth: nemaara wesnoth:nemaara-master 5dad0064f21e / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Redrawn map for S12_The_Underlevels https://github.com/wesnoth/wesnoth/commit/5dad0064f21e62c6c99523e3a5f89e79badc1eb0 20181215 17:19:43< irker223> wesnoth: nemaara wesnoth:nemaara-master 43d4bfda7f6d / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Rewritten scenario for The Hammer of Thursagan, S12_The_Underlevels https://github.com/wesnoth/wesnoth/commit/43d4bfda7f6dd5d4cd106e9c4a4ba83b3a3157ee 20181215 17:19:45< irker223> wesnoth: nemaara wesnoth:nemaara-master 7ea68a0fb990 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Rewritten scenario for The Hammer of Thursagan S12_The_Underlevels https://github.com/wesnoth/wesnoth/commit/7ea68a0fb9905ef6d5cf0ba7f9ecb5dd7ac98739 20181215 17:19:47< irker223> wesnoth: nemaara wesnoth:nemaara-master 72b332a20dd5 / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Revised THoT S12 Map rework https://github.com/wesnoth/wesnoth/commit/72b332a20dd5c85cb3c02f928557f557c0840682 20181215 17:19:49< irker223> wesnoth: nemaara wesnoth:nemaara-master 80be74153d3c / data/campaigns/The_Hammer_of_Thursagan/ (maps/12_The_Underlevels.map scenarios/12_The_Underlevels.cfg): Added small areas for eye candy and extra events for THoT https://github.com/wesnoth/wesnoth/commit/80be74153d3c25375463bfd27a4aae79c35a4f75 20181215 17:19:51< irker223> wesnoth: nemaara wesnoth:nemaara-master b94c07bb89aa / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Fixed map path and textdomain https://github.com/wesnoth/wesnoth/commit/b94c07bb89aa30249a65341aea45ebe63e043ac3 20181215 17:19:53< irker223> wesnoth: nemaara wesnoth:nemaara-master 3f5b268141ae / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Updated S12 map https://github.com/wesnoth/wesnoth/commit/3f5b268141aebec50e386212e0fd5f573e03b575 20181215 17:19:55< irker223> wesnoth: nemaara wesnoth:nemaara-master 1ad38200895a / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Added ability for side 1 to see past gates https://github.com/wesnoth/wesnoth/commit/1ad38200895acfdc20874f07a15b2522c8c36ee6 20181215 17:19:57< irker223> wesnoth: nemaara wesnoth:nemaara-master 95f73ad106d3 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Replaced all gate-vision modifying events with the 'unit placed' event https://github.com/wesnoth/wesnoth/commit/95f73ad106d3b39bd24395fdfb684fca713a2143 20181215 17:19:59< irker223> wesnoth: nemaara wesnoth:nemaara-master c8748e6bb1fa / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Fixed dash in message and hitpoint gain now remains after advancing https://github.com/wesnoth/wesnoth/commit/c8748e6bb1fae65f6deb03a4731b2b11491e0d55 20181215 17:20:01< irker223> wesnoth: nemaara wesnoth:nemaara-master 27cc3b92807a / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Added some extra terrain variety https://github.com/wesnoth/wesnoth/commit/27cc3b92807aa85ab4768e394870e0ea7dc8e3a9 20181215 17:20:03< irker223> wesnoth: nemaara wesnoth:nemaara-master d523b5f2574d / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: THoT S12: small QOL changes https://github.com/wesnoth/wesnoth/commit/d523b5f2574d7d3cab63124298637347ba8bb457 20181215 17:20:05< irker223> wesnoth: nemaara wesnoth:nemaara-master d5785ae73124 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: THoT S12: added translation comment https://github.com/wesnoth/wesnoth/commit/d5785ae7312492db2bd6b51f263306c024f0c665 20181215 17:20:07< irker223> wesnoth: nemaara wesnoth:nemaara-master 93d39e3d3801 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: THoT S12: rebalanced AI gold https://github.com/wesnoth/wesnoth/commit/93d39e3d3801be2d690b7238dd00c363757cf0c3 20181215 17:20:09< irker223> wesnoth: nemaara wesnoth:nemaara-master 6256341c0149 / changelog.md: Added player note for THoT S12 update in 1.14.6 https://github.com/wesnoth/wesnoth/commit/6256341c0149e86771f24015105ee7c49c0e1c28 20181215 17:20:11< irker223> wesnoth: pentarctagon wesnoth:nemaara-master 615fe820110f / / (3 files in 3 dirs): Merge branch 'master' of https://github.com/nemaara/wesnoth into nemaara-master https://github.com/wesnoth/wesnoth/commit/615fe820110fec30bb5120650c15747ee219022e 20181215 17:20:19<+wesdiscordbot> @josteph I meant for the Dwarvish Champer to remain fogged, merely lifting the shroud, while both treasury and amulet remain shrouded. :D 20181215 17:20:26<+wesdiscordbot> hm 20181215 17:20:47<+wesdiscordbot> @Konrad2 sorry for misquoting you! 20181215 17:21:24<+wesdiscordbot> Only lifting the fog where you supposedly have some intelligence about it. ^^ 20181215 17:21:29<+wesdiscordbot> *shroud 20181215 17:21:40<+wesdiscordbot> edited 20181215 17:21:53<+wesdiscordbot> And fog means you can't see it, which is pretty reasonable in narrow caves. 20181215 17:22:43<+wesdiscordbot> yeah, I know how the fog mechanic works 😃 20181215 17:23:14<+wesdiscordbot> but why should the dwarves chamber be fogged after you've met them? 20181215 17:23:36<+wesdiscordbot> if they're allies, they'd tell you if they have a troll in their throne room 20181215 17:26:18<+wesdiscordbot> also, leaving the amulet shrouded.. I assumed that it should be shrouded until you meet the dwarves 20181215 17:26:27<+wesdiscordbot> I can see leaving it fogged afterwards, it shouldn't make much of a difference 20181215 17:26:51<+wesdiscordbot> I thought of having shared vision with the dwarves, but the dwarves are not necessarily everywhere in the dwarf chamber when you spot each other. 20181215 17:27:23<+wesdiscordbot> argh 20181215 17:28:19<+wesdiscordbot> Tbh, I don't think the dwarves know about the amulet, which is why I didn't suggest unshrouding it. 20181215 17:29:26<+wesdiscordbot> To me it's more of a nice touch that fits with the story and explanation and not a really relevant issue. 20181215 17:29:39<+wesdiscordbot> so, question: how do I fix merge conflicts on someone else's PR/branch of a forked repo? 20181215 17:30:25<+wesdiscordbot> You can fetch their branch to your own repository, then add your own commits on top. 20181215 17:31:33<+wesdiscordbot> You can also merge directly in your own repo, but AFAIK it's difficult to then open a PR out of the resulting branch (it would be eeasier to just push the merge directly). 20181215 17:32:22<+wesdiscordbot> uh 20181215 17:32:40<+wesdiscordbot> why would there be merge conflicts hmmm 20181215 17:33:04<+wesdiscordbot> https://cdn.discordapp.com/attachments/259976436490829825/523553087974014976/unknown.png 20181215 17:33:37<+wesdiscordbot> apparently 20181215 17:33:41<+wesdiscordbot> Leave this be for a while. The merge conflict is simple: accept both changes. There's a couple/four lines with trailing whitespace. I just did a test run rebasing, squashing and fixing and it's no problem. 20181215 17:34:26<+wesdiscordbot> the changelog it looks like a Campaigns section got added for DiD in the mean time, but that's about it. for the scenario cfg, I don't know. 20181215 17:34:37<+wesdiscordbot> oh. 20181215 17:34:39<+wesdiscordbot> hmm 20181215 17:35:59-!- travis-ci [~travis-ci@ec2-54-159-250-182.compute-1.amazonaws.com] has joined #wesnoth-dev 20181215 17:36:00< travis-ci> wesnoth/wesnoth#20401 (master - d169d52 : mstrebel): The build passed. 20181215 17:36:00< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/468437709 20181215 17:36:00-!- travis-ci [~travis-ci@ec2-54-159-250-182.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181215 17:38:27<+wesdiscordbot> To add to @jyrkive 's answer: the author of a PR can allow anyone who can push to wesnoth/wesnoth to push to their branch in their repository.. but I'd do what jyrkive said, do the merge locally and push it. 20181215 17:39:10<+wesdiscordbot> @Konrad2 I assumed the dwarves would know the geography of the tunnels around them.. but then, how come they didn't know about the treasure. 20181215 17:39:59<+wesdiscordbot> @Konrad2 Maybe the dwarves should tell Gweddery about the treasure. "Hey, there's some troll gold there that we don't need, take it on, godspeed" 20181215 17:40:13<+wesdiscordbot> @Yumi looks like it's missing https://github.com/wesnoth/wesnoth/commit/7c34313a41e8af752470d38118ea6e2fc6ba59a6#diff-a60373660abd79e4ea7c9ee6a8d3bc09 and https://github.com/wesnoth/wesnoth/commit/1b10534e826b808b59d2fc8f731998a16024e7fe#diff-a60373660abd79e4ea7c9ee6a8d3bc09 20181215 17:41:04<+wesdiscordbot> hmm 20181215 17:41:12<+wesdiscordbot> the second one shouldn't go in period 20181215 17:41:20<+wesdiscordbot> since I just straight removed those units 20181215 17:42:36<+wesdiscordbot> hmm. 20181215 17:42:45<+wesdiscordbot> there are still several NOTRAIT_UNIT () ... macros, which will fail the schema validation. 20181215 17:45:06<+wesdiscordbot> @josteph Considering that they never tried communicating with the humans on top of them and that they are living next to a nest of trolls...I'd actually think that they have been fighting a losing war for ages and are cut off from their surroundings. But it's very open for interpretation. 20181215 17:46:12<+wesdiscordbot> I'll have to deal with those later, I need to work on an exam for now 20181215 17:48:12<+wesdiscordbot> @Konrad2 Dwarves not communicating with humans on top of them is explainable (because the tunnel is kilometers long, because dwarves generally distrust other races).. but yeah, the trolls nest is so close to the dwarves that the amulet room could be uncharted lands for them 20181215 17:54:38< celticminstrel> Lots od merges today. \o/ 20181215 17:54:40< celticminstrel> ^of 20181215 17:55:53-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 246 seconds] 20181215 17:57:27-!- travis-ci [~travis-ci@ec2-54-158-101-249.compute-1.amazonaws.com] has joined #wesnoth-dev 20181215 17:57:28< travis-ci> wesnoth/wesnoth#20402 (1.14 - 125e0e1 : mstrebel): The build passed. 20181215 17:57:28< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/468438026 20181215 17:57:28-!- travis-ci [~travis-ci@ec2-54-158-101-249.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181215 18:04:16<+wesdiscordbot> @Yumi The conflicts do look pretty simple, but I don't really have a whole lot of confidence in how I'm telling git to do it, and I don't want to do something stupid to either your repo or the main wesnoth repo. 20181215 18:07:05<+wesdiscordbot> @Pentarctagon if you push the conflicts to your github repo I can review them before you push them to wesnoth 20181215 19:26:56< irker223> wesnoth: nemaara wesnoth:master 5dad0064f21e / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Redrawn map for S12_The_Underlevels https://github.com/wesnoth/wesnoth/commit/5dad0064f21e62c6c99523e3a5f89e79badc1eb0 20181215 19:26:58< irker223> wesnoth: nemaara wesnoth:master 43d4bfda7f6d / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Rewritten scenario for The Hammer of Thursagan, S12_The_Underlevels https://github.com/wesnoth/wesnoth/commit/43d4bfda7f6dd5d4cd106e9c4a4ba83b3a3157ee 20181215 19:27:00< irker223> wesnoth: nemaara wesnoth:master 7ea68a0fb990 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Rewritten scenario for The Hammer of Thursagan S12_The_Underlevels https://github.com/wesnoth/wesnoth/commit/7ea68a0fb9905ef6d5cf0ba7f9ecb5dd7ac98739 20181215 19:27:02< irker223> wesnoth: nemaara wesnoth:master 72b332a20dd5 / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Revised THoT S12 Map rework https://github.com/wesnoth/wesnoth/commit/72b332a20dd5c85cb3c02f928557f557c0840682 20181215 19:27:04< irker223> wesnoth: nemaara wesnoth:master 80be74153d3c / data/campaigns/The_Hammer_of_Thursagan/ (maps/12_The_Underlevels.map scenarios/12_The_Underlevels.cfg): Added small areas for eye candy and extra events for THoT https://github.com/wesnoth/wesnoth/commit/80be74153d3c25375463bfd27a4aae79c35a4f75 20181215 19:27:06< irker223> wesnoth: nemaara wesnoth:master b94c07bb89aa / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Fixed map path and textdomain https://github.com/wesnoth/wesnoth/commit/b94c07bb89aa30249a65341aea45ebe63e043ac3 20181215 19:27:08< irker223> wesnoth: nemaara wesnoth:master 3f5b268141ae / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Updated S12 map https://github.com/wesnoth/wesnoth/commit/3f5b268141aebec50e386212e0fd5f573e03b575 20181215 19:27:10< irker223> wesnoth: nemaara wesnoth:master 1ad38200895a / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Added ability for side 1 to see past gates https://github.com/wesnoth/wesnoth/commit/1ad38200895acfdc20874f07a15b2522c8c36ee6 20181215 19:27:12< irker223> wesnoth: nemaara wesnoth:master 95f73ad106d3 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Replaced all gate-vision modifying events with the 'unit placed' event https://github.com/wesnoth/wesnoth/commit/95f73ad106d3b39bd24395fdfb684fca713a2143 20181215 19:27:14< irker223> wesnoth: nemaara wesnoth:master c8748e6bb1fa / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Fixed dash in message and hitpoint gain now remains after advancing https://github.com/wesnoth/wesnoth/commit/c8748e6bb1fae65f6deb03a4731b2b11491e0d55 20181215 19:27:16< irker223> wesnoth: nemaara wesnoth:master 27cc3b92807a / data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map: Added some extra terrain variety https://github.com/wesnoth/wesnoth/commit/27cc3b92807aa85ab4768e394870e0ea7dc8e3a9 20181215 19:27:18< irker223> wesnoth: nemaara wesnoth:master d523b5f2574d / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: THoT S12: small QOL changes https://github.com/wesnoth/wesnoth/commit/d523b5f2574d7d3cab63124298637347ba8bb457 20181215 19:27:18<+wesdiscordbot> @Yumi ^ 20181215 19:27:20< irker223> wesnoth: nemaara wesnoth:master d5785ae73124 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: THoT S12: added translation comment https://github.com/wesnoth/wesnoth/commit/d5785ae7312492db2bd6b51f263306c024f0c665 20181215 19:27:22< irker223> wesnoth: nemaara wesnoth:master 93d39e3d3801 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: THoT S12: rebalanced AI gold https://github.com/wesnoth/wesnoth/commit/93d39e3d3801be2d690b7238dd00c363757cf0c3 20181215 19:27:24< irker223> wesnoth: nemaara wesnoth:master 6256341c0149 / changelog.md: Added player note for THoT S12 update in 1.14.6 https://github.com/wesnoth/wesnoth/commit/6256341c0149e86771f24015105ee7c49c0e1c28 20181215 19:27:26< irker223> wesnoth: pentarctagon wesnoth:master b667b81d7cc1 / / (3 files in 3 dirs): Merge branch 'master' of https://github.com/nemaara/wesnoth into nemaara-master https://github.com/wesnoth/wesnoth/commit/b667b81d7cc14a91402eccc146460223cd07ec5f 20181215 19:27:28< irker223> wesnoth: pentarctagon wesnoth:master 034211c64ff8 / data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg: Fix for WML schema validation. https://github.com/wesnoth/wesnoth/commit/034211c64ff8a31d74c16b1256ea131c571b1b34 20181215 19:28:34<+wesdiscordbot> :0 20181215 19:28:41<+wesdiscordbot> thanks, great that you got it to work 20181215 19:28:41<+wesdiscordbot> :p 20181215 19:49:45-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20181215 20:15:27< irker223> wesnoth/wesnoth:master newfrenchy83 d8022381f5 add filter_student equivalent to weapon AppVeyor: All builds passed 20181215 21:16:31< irker223> wesnoth: pentarctagon wesnoth:1.14 457d9d17f994 / / (3 files in 3 dirs): Merge branch 'master' of https://github.com/nemaara/wesnoth into nemaara-master https://github.com/wesnoth/wesnoth/commit/457d9d17f99492bae21db2d94f713a9df0b4f77d 20181215 21:19:48<+wesdiscordbot> also it looks like there are some things missing from at least the changelog, between 1.14 and master. 20181215 21:20:49<+wesdiscordbot> https://cdn.discordapp.com/attachments/259976436490829825/523610398986076200/changelogs.png 20181215 21:21:36<+wesdiscordbot> The intent is to copy the changes from 1.14 to master later. 20181215 21:21:45<+wesdiscordbot> There is no need to keep them permanently in sync. 20181215 21:21:52<+wesdiscordbot> alright 20181215 21:22:29<+wesdiscordbot> I wasn't sure if that meant there were things missing that shouldn't be or not. 20181215 21:29:39< irker223> wesnoth: pentarctagon wesnoth:master 5978228551c1 / changelog.md: Changelog for #3648 [TSG] Scenario redesign https://github.com/wesnoth/wesnoth/commit/5978228551c1e200ed984a38a766669aa4cd3632 20181215 21:31:32-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20181215 21:31:52< irker223> wesnoth: pentarctagon wesnoth:1.14 cd598a570cb7 / changelog.md: Changelog for #3648 [TSG] Scenario redesign https://github.com/wesnoth/wesnoth/commit/cd598a570cb7549888e376c8caebc5f29507eed4 20181215 21:52:52< irker223> wesnoth/wesnoth:master newfrenchy83 aa4f478427 Update aspect_attacks.cpp AppVeyor: All builds passed 20181215 23:04:51< irker223> wesnoth/wesnoth:master newfrenchy83 2875edc36e Update aspect_attacks.cpp AppVeyor: All builds passed --- Log closed Sun Dec 16 00:00:51 2018