--- Log opened Thu Oct 18 00:00:44 2018 20181018 00:00:53<+wesdiscordbot> @mattsc The issue that you'd most likely need to take a look at related to master would be https://github.com/wesnoth/wesnoth/issues/3614 20181018 00:02:39<+wesdiscordbot> @Pentarctagon Right. That. and #3022, which in fact mentions that one of my PRs might have to be reopened and dealt with. 20181018 00:03:04<+wesdiscordbot> I'm a bit puzzled why that did not port cleanly and without problems, but I haven't had time to look into it yet. 20181018 00:03:10<+wesdiscordbot> Anyways, thanks. 20181018 00:20:51-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20181018 00:37:00-!- celmin|away is now known as celticminstrel 20181018 01:01:50< irker541> wesnoth/wesnoth:master newfrenchy83 4ba3741340 Update libraries.md AppVeyor: All builds passed 20181018 02:08:39-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20181018 02:48:16-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has quit [Quit: KABOOM! It seems that I have exploded. Please wait while I reinstall the universe.] 20181018 02:48:35-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev 20181018 03:18:45< celticminstrel> Oh yeah, https://github.com/wesnoth/wesnoth/issues/3624 needs wontfix label. 20181018 03:19:00< celticminstrel> If someone could do it that would be good. 20181018 03:19:15< celticminstrel> I can't do it now and will probably forget later. 20181018 03:27:54-!- celticminstrel is now known as celmin|sleep 20181018 03:46:31< irker541> wesnoth/wesnoth:master nemaara b4eb9d663b THoT S12: small QOL changes AppVeyor: All builds passed 20181018 04:23:34<+wesdiscordbot> @suto3 /（す）🍣 I noticed that you mentioned in #japanese that the Wesnoth master branch crashes on Windows. 20181018 04:23:41<+wesdiscordbot> I just fixed that yesterday: https://github.com/wesnoth/wesnoth/commit/b3e1680f886ec27c29150912bb27949d7cdd7f6e 20181018 04:25:38-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Quit: wedge009] 20181018 04:52:22-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20181018 04:52:57-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Client Quit] 20181018 05:21:46-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20181018 06:12:23< irker541> wesnoth/wesnoth:master nemaara 313959c83e DiD S10: added time over defeat scene AppVeyor: All builds passed 20181018 07:20:28-!- Nobun [~user@51.179.102.116] has joined #wesnoth-dev 20181018 07:34:00-!- aeth [~Michael@wesnoth/umc-dev/developer/aethaeryn] has quit [Read error: Connection reset by peer] 20181018 07:35:06-!- aeth [~Michael@wesnoth/umc-dev/developer/aethaeryn] has joined #wesnoth-dev 20181018 08:26:10<+wesdiscordbot> @jyrkive thanks. 🍣 20181018 08:28:30< irker541> wesnoth/wesnoth:1.14 Severin Glöckner 0d4c7fd415 German Translation: small fix in SoF AppVeyor: All builds passed 20181018 08:54:48-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20181018 08:54:56<+wesdiscordbot> damn, mongodb has a GUI o_o 20181018 09:32:56<+wesdiscordbot> Hello all, new guy here... So im an artist who was suggested to go here from the Godot facebook group to potentially make sprites(maybe even animated) for the Godot port of Wesnoth. I think I heard that there was some licensing issues with some of the unit sprites? and they needed some new ones. If this is true then I would like to test the waters and see if my style fits well into wesnoth. So if anyone could point me 20181018 09:32:56<+wesdiscordbot> in the right direction I would super appreciate it. (ps im also new to discord in general so I dont know what im doing) 20181018 09:49:20<+wesdiscordbot> Hello @Marsleader. :) @Vultrazand myself are currently responsible for the godot prototype, so talk to us, if you have questions. As of the license issues, we are currently trying to get as many of the artists that worked / are working on the Wesnoth 1.x project to give us permission for using their art in the godot prototype as well, so we are not exactly sure what we can take over and what we will need to replace. Also, 20181018 09:49:21<+wesdiscordbot> @LordBob is currently working on a set of terrain tiles for the godot project. Maybe you two can exchange a few words in terms of art style, there might be some changes to the current one, iirc. If you want to have a look at the current art, here are some links: Terrain Table: https://wiki.wesnoth.org/TerrainCodeTableWML Units: https://units.wesnoth.org/1.14/mainline/en_US/mainline.html We are also discussing to create a new HUD 20181018 09:49:21<+wesdiscordbot> / GUI with the new tools that godot brings, so there is a very good chance we will need new UI elements such as buttons, menus, unit-status palettes and such. 20181018 09:52:07<+wesdiscordbot> To get a complete impression of the artwork, it's probably best to just have a look into the game. :P You can download it either from the webpage ( www.wesnoth.org ), or from the steam store. 20181018 09:52:18<+wesdiscordbot> (if you haven't already) 20181018 09:54:46<+wesdiscordbot> Even if we don’t need to replace anything, there are a lot of sprites that could use redraws and/it animations 20181018 09:56:07<+wesdiscordbot> So new art is always welcome 20181018 09:59:20-!- gfgtdf [~gfgtdf@134.76.63.8] has joined #wesnoth-dev 20181018 10:48:18-!- Nobun [~user@51.179.102.116] has quit [Quit: WeeChat 2.1-dev] 20181018 10:54:13-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 245 seconds] 20181018 10:58:17-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20181018 11:01:59<+wesdiscordbot> I get an error when opening the settings ingame… 20181018 11:02:31<+wesdiscordbot> What kind of error? 20181018 11:04:52<+wesdiscordbot> https://cdn.discordapp.com/attachments/259976436490829825/502436897986052097/1.14.png 20181018 11:06:28<+wesdiscordbot> I see. Apparently the WML for the FPS limiter checkbox has been lost but the C++ is still there. 20181018 11:07:03<+wesdiscordbot> Though… I prepared an PR a few hours before where I definitely accessed the settings … and now it's reproducible … all I changed was scenario WML 20181018 11:08:34<+wesdiscordbot> ah… I'm on the new master branch, while my build is from the 1.14 branch 20181018 11:13:52-!- travis-ci [~travis-ci@ec2-107-20-88-221.compute-1.amazonaws.com] has joined #wesnoth-dev 20181018 11:13:53< travis-ci> gfgtdf/wesnoth#1376 (master - e53b262 : gfgtdf): The build is still failing. 20181018 11:13:53< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth/builds/443118538 20181018 11:13:55-!- travis-ci [~travis-ci@ec2-107-20-88-221.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181018 11:28:40-!- irker541 [~irker@wesnoth/umc-dev/bot/shikadibot] has quit [Quit: transmission timeout] 20181018 11:29:19-!- travis-ci [~travis-ci@ec2-54-196-16-97.compute-1.amazonaws.com] has joined #wesnoth-dev 20181018 11:29:20< travis-ci> gfgtdf/wesnoth#1377 (master - 0d1c190 : gfgtdf): The build is still failing. 20181018 11:29:20< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth/builds/443132537 20181018 11:29:20-!- travis-ci [~travis-ci@ec2-54-196-16-97.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181018 11:43:38-!- irker772 [~irker@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev 20181018 11:43:38< irker772> wesnoth/wesnoth:1.14 Konrad2 8c3ad8d40a update credits AppVeyor: All builds passed 20181018 11:47:21-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20181018 12:09:38-!- travis-ci [~travis-ci@ec2-54-159-112-7.compute-1.amazonaws.com] has joined #wesnoth-dev 20181018 12:09:39< travis-ci> gfgtdf/wesnoth#1378 (master - f34c9ca : gfgtdf): The build is still failing. 20181018 12:09:39< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth/builds/443135675 20181018 12:09:39-!- travis-ci [~travis-ci@ec2-54-159-112-7.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181018 12:13:55< irker772> wesnoth/wesnoth:1.14 Konrad2 893986dee4 update credits AppVeyor: All builds passed 20181018 12:18:18-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20181018 12:39:47-!- celmin|sleep is now known as celmin|away 20181018 13:21:18< irker772> wesnoth/wesnoth:master nemaara 7224526c4e THoT S12: added translation comment AppVeyor: All builds passed 20181018 13:44:50< irker772> wesnoth: newfrenchy83 wesnoth:master f594019433de / projectfiles/CodeBlocks/ (README.md campaignd.cbp libraries.md wesnoth.cbp wesnothd.cbp): Update Code::Blocks project and add documentation https://github.com/wesnoth/wesnoth/commit/f594019433de6c2709151cf5319d12c2265894bf 20181018 15:24:57-!- heirecka [~heirecka@exherbo/developer/heirecka] has quit [Remote host closed the connection] 20181018 15:25:24-!- heirecka [~heirecka@exherbo/developer/heirecka] has joined #wesnoth-dev 20181018 16:28:29-!- behalebabo [~behalebab@unaffiliated/behalebabo] has quit [Excess Flood] 20181018 16:31:58< irker772> wesnoth/wesnoth:master newfrenchy83 3632652706 Update _main.cfg AppVeyor: All builds passed 20181018 16:37:49-!- behalebabo [~behalebab@unaffiliated/behalebabo] has joined #wesnoth-dev 20181018 16:56:25-!- behalebabo [~behalebab@unaffiliated/behalebabo] has quit [Ping timeout: 268 seconds] 20181018 17:02:57-!- behalebabo [~behalebab@unaffiliated/behalebabo] has joined #wesnoth-dev 20181018 17:21:57-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20181018 17:24:36< irker772> wesnoth: DisherProject wesnoth:master 5be5d3269013 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (12 files): TRoW: General cleanup https://github.com/wesnoth/wesnoth/commit/5be5d3269013f8d6f87327761f4d734b94b8c73d 20181018 17:24:38< irker772> wesnoth: DisherProject wesnoth:master 15d2b035e512 / data/campaigns/The_Rise_Of_Wesnoth/ (scenarios/05_The_Oldwood.cfg utils/trow-macros.cfg): TRoW: Replace deprecated keys https://github.com/wesnoth/wesnoth/commit/15d2b035e51203c3b5ff7aa74da8bfc775f5e475 20181018 17:24:40< irker772> wesnoth: DisherProject wesnoth:master 2dbf9f87eb4a / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (5 files): TRoW: Fix some TODOs and add more https://github.com/wesnoth/wesnoth/commit/2dbf9f87eb4ada7b08d3ec059a378d01ad56689a 20181018 17:24:42< irker772> wesnoth: DisherProject wesnoth:master 60d24516ef9a / data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg: TRoW S6: Replace old sound with unit's own defending animation https://github.com/wesnoth/wesnoth/commit/60d24516ef9a6493c0e53e7f22c06ee18c01a5f2 20181018 17:24:44< irker772> wesnoth: DisherProject wesnoth:master 7c6bb1251542 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg: TRoW S15: Update Dionli's unit image https://github.com/wesnoth/wesnoth/commit/7c6bb1251542e1175ba9843c0d7f33f7a9fe73dd 20181018 17:24:46< irker772> wesnoth: DisherProject wesnoth:master b911e9a19641 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg: TRoW S17d: Kill all enemy units in the end https://github.com/wesnoth/wesnoth/commit/b911e9a19641d938031f29c6a714135e8cf63d53 20181018 17:24:48< irker772> wesnoth: DisherProject wesnoth:master dd24dd6b6e2a / data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg: TRoW S22: Fix win and defeat conditions https://github.com/wesnoth/wesnoth/commit/dd24dd6b6e2a3a7837bff6da548d6d2b26ee92a5 20181018 17:24:50< irker772> wesnoth: DisherProject wesnoth:master 1311aa0aed27 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (12_A_Final_Spring.cfg 17d_Cursed_Isle.cfg): TRoW: use [show_if] inside the [objectives] tag https://github.com/wesnoth/wesnoth/commit/1311aa0aed276b2d7c0a9db8b1b8e6b2fd2a3a93 20181018 17:24:52< irker772> wesnoth: DisherProject wesnoth:master 8a0490b11124 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (5 files): TRoW: Give monsters and undeads their own sides https://github.com/wesnoth/wesnoth/commit/8a0490b11124e0b6f57f571db715531a1551d038 20181018 17:24:54< irker772> wesnoth: DisherProject wesnoth:master 9c267b14334f / data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg: TRoW S4: Fix scorpions placement https://github.com/wesnoth/wesnoth/commit/9c267b14334f4af212947e507d4c2979fa94d280 20181018 17:24:56< irker772> wesnoth: DisherProject wesnoth:master 5e2ccd911b46 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg: TRoW S14: Fix sea serpents placement https://github.com/wesnoth/wesnoth/commit/5e2ccd911b46872c7cbaa33e26311b754075f5d2 20181018 17:24:58< irker772> wesnoth: DisherProject wesnoth:master 023b575d0b94 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (04a_The_Swamp_of_Esten.cfg 04b_The_Midlands.cfg 12_A_Final_Spring.cfg): TRoW: Clear new TODOs https://github.com/wesnoth/wesnoth/commit/023b575d0b94d315bfa6d0cb9ebfabd75bae6c0b 20181018 17:25:56< irker772> wesnoth: gfgtdf wesnoth:master 7599746b25d2 / src/ (config.cpp config.hpp saved_game.cpp saved_game.hpp): put [resource] before other content (again); fixes #3345 https://github.com/wesnoth/wesnoth/commit/7599746b25d250728d91b287a98d3b9d914f5963 20181018 17:33:30< irker772> wesnoth: DisherProject wesnoth:1.14 7f1ef8b49208 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (12 files): TRoW: General cleanup https://github.com/wesnoth/wesnoth/commit/7f1ef8b492086b5fa9355629d1a6a1ee305964bf 20181018 17:33:32< irker772> wesnoth: DisherProject wesnoth:1.14 0ec18ee8ffd3 / data/campaigns/The_Rise_Of_Wesnoth/ (scenarios/05_The_Oldwood.cfg utils/trow-macros.cfg): TRoW: Replace deprecated keys https://github.com/wesnoth/wesnoth/commit/0ec18ee8ffd3837595d76550754011d0c3388b6f 20181018 17:33:34< irker772> wesnoth: DisherProject wesnoth:1.14 c0316114411e / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (5 files): TRoW: Fix some TODOs and add more https://github.com/wesnoth/wesnoth/commit/c0316114411e1235802435778c9e2140abf51d8f 20181018 17:33:36< irker772> wesnoth: DisherProject wesnoth:1.14 157b250c6ce8 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg: TRoW S6: Replace old sound with unit's own defending animation https://github.com/wesnoth/wesnoth/commit/157b250c6ce86cf2cae940fade5124b09169ff11 20181018 17:33:38< irker772> wesnoth: DisherProject wesnoth:1.14 b9197df02770 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg: TRoW S15: Update Dionli's unit image https://github.com/wesnoth/wesnoth/commit/b9197df02770160131cbd5582935083507ab344e 20181018 17:33:40< irker772> wesnoth: DisherProject wesnoth:1.14 871f637e26a4 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg: TRoW S17d: Kill all enemy units in the end https://github.com/wesnoth/wesnoth/commit/871f637e26a42a1fc3efad89976a0f3d237d78de 20181018 17:33:42< irker772> wesnoth: DisherProject wesnoth:1.14 3096f19bd7d8 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg: TRoW S22: Fix win and defeat conditions https://github.com/wesnoth/wesnoth/commit/3096f19bd7d8eb263428923c8958bf631506dc43 20181018 17:33:44< irker772> wesnoth: DisherProject wesnoth:1.14 d2a63b995309 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (12_A_Final_Spring.cfg 17d_Cursed_Isle.cfg): TRoW: use [show_if] inside the [objectives] tag https://github.com/wesnoth/wesnoth/commit/d2a63b9953096fcb6cc04cd29308482606198db1 20181018 17:33:46< irker772> wesnoth: DisherProject wesnoth:1.14 381a022e2824 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (5 files): TRoW: Give monsters and undeads their own sides https://github.com/wesnoth/wesnoth/commit/381a022e2824c6e40c96cea0fec7d1d6dc2435c6 20181018 17:33:48< irker772> wesnoth: DisherProject wesnoth:1.14 a82f38cd16c5 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg: TRoW S4: Fix scorpions placement https://github.com/wesnoth/wesnoth/commit/a82f38cd16c5f57a273274da9e19b15cde778f47 20181018 17:33:50< irker772> wesnoth: DisherProject wesnoth:1.14 48c75457bad0 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg: TRoW S14: Fix sea serpents placement https://github.com/wesnoth/wesnoth/commit/48c75457bad0e889397d728eaaa6a48b14117c50 20181018 17:33:52< irker772> wesnoth: DisherProject wesnoth:1.14 0dc5a8c7d924 / data/campaigns/The_Rise_Of_Wesnoth/scenarios/ (04a_The_Swamp_of_Esten.cfg 04b_The_Midlands.cfg 12_A_Final_Spring.cfg): TRoW: Clear new TODOs https://github.com/wesnoth/wesnoth/commit/0dc5a8c7d924905bd1349c341b54e0559efc14ea 20181018 17:43:22< irker772> wesnoth: DisherProject wesnoth:master d02ed7b0c228 / data/campaigns/Son_Of_The_Black_Eye/scenarios/07_The_Desert_of_Death.cfg: SotBE S7: Fix filter for scorpions' poisonous attack https://github.com/wesnoth/wesnoth/commit/d02ed7b0c2281d182bc2bede79f48c8eee7e51b7 20181018 17:43:24< irker772> wesnoth: DisherProject wesnoth:master 036f663c2fe0 / data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg: SotBE S3: Don't put two [endlevel]s in the same event https://github.com/wesnoth/wesnoth/commit/036f663c2fe03a178ebc0256a46ccd0f73782b06 20181018 17:43:26< irker772> wesnoth: DisherProject wesnoth:master 7b77d5f7d1bf / data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg: SotBE S4: Add some visual effect https://github.com/wesnoth/wesnoth/commit/7b77d5f7d1bf8b582afebbcc91c4367d083543ae 20181018 17:43:28< irker772> wesnoth: DisherProject wesnoth:master a73656ae0a49 / data/campaigns/Son_Of_The_Black_Eye/scenarios/ (6 files): SotBE: Update role tag usage https://github.com/wesnoth/wesnoth/commit/a73656ae0a499a54d716a4d7367b73028051eb84 20181018 17:43:30< irker772> wesnoth: DisherProject wesnoth:master e2214a06aa44 / data/campaigns/Son_Of_The_Black_Eye/scenarios/ (02_The_Human_Army.cfg 03_Toward_Mountains_of_Haag.cfg 15_Civil_War.cfg): SotBE: Add [show_if] to the objectives tag https://github.com/wesnoth/wesnoth/commit/e2214a06aa44fdfc926078b4785abbf1c8007ced 20181018 17:44:19<+wesdiscordbot> 👍 20181018 17:48:40< irker772> wesnoth: DisherProject wesnoth:1.14 e8f8dd85b923 / data/campaigns/Son_Of_The_Black_Eye/scenarios/07_The_Desert_of_Death.cfg: SotBE S7: Fix filter for scorpions' poisonous attack https://github.com/wesnoth/wesnoth/commit/e8f8dd85b9238d3708feb6b5cc97c4a71d39356f 20181018 17:48:42< irker772> wesnoth: DisherProject wesnoth:1.14 b62eaed0ae4e / data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg: SotBE S3: Don't put two [endlevel]s in the same event https://github.com/wesnoth/wesnoth/commit/b62eaed0ae4e95cd46ccc754fafa0f96fa900f2f 20181018 17:48:44< irker772> wesnoth: DisherProject wesnoth:1.14 0410cb881c13 / data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg: SotBE S4: Add some visual effect https://github.com/wesnoth/wesnoth/commit/0410cb881c13ab8103cd1ed26aa663d08ec58485 20181018 17:48:46< irker772> wesnoth: DisherProject wesnoth:1.14 b66da7775215 / data/campaigns/Son_Of_The_Black_Eye/scenarios/ (6 files): SotBE: Update role tag usage https://github.com/wesnoth/wesnoth/commit/b66da77752151e0f6c3da205efeae9b9d260f4d9 20181018 17:48:48< irker772> wesnoth: DisherProject wesnoth:1.14 483690c63dfc / data/campaigns/Son_Of_The_Black_Eye/scenarios/ (02_The_Human_Army.cfg 03_Toward_Mountains_of_Haag.cfg 15_Civil_War.cfg): SotBE: Add [show_if] to the objectives tag https://github.com/wesnoth/wesnoth/commit/483690c63dfc030d8fe1002281dd85704f8db61a 20181018 18:07:05<+wesdiscordbot> I have a time over event where the protagonist is killed. For killing, a unit should move next to him, and play an animation. Is there an better way than what I have done… ht eparticular drawbacks are that it only works if he is not surrounded, and that it is allways the nw hex used… while the attacker may come from east. I'm not really happy about the 'next_to_alanin' part 20181018 18:07:06<+wesdiscordbot> https://github.com/wesnoth/wesnoth/pull/3628/commits It's the fourth commit, feedback appreciated 20181018 18:17:22-!- matthiaskrgr [matthiaskr@gateway/shell/panicbnc/x-bgywucuvteyasckf] has joined #wesnoth-dev 20181018 18:17:34< matthiaskrgr> did someone force push master a few weeks ago or something? 20181018 18:19:35< matthiaskrgr> wth 20181018 18:19:45<+wesdiscordbot> yes 20181018 18:20:01< matthiaskrgr> I tried resetting the last 1000 commits but still merge conflicts 20181018 18:20:15<+wesdiscordbot> the current master is the old master without the accelerate rendering parts 20181018 18:20:26<+wesdiscordbot> I think it were ~1500 commits 20181018 18:20:29< matthiaskrgr> uff 20181018 18:20:35<+wesdiscordbot> the old master is still on another branch 20181018 18:20:57<+wesdiscordbot> old_master_20181015 20181018 18:22:03< matthiaskrgr> did this revert the gui2 stuff? 20181018 18:23:15< matthiaskrgr> I guess I will see after this build is done .. :) 20181018 18:25:01<+wesdiscordbot> git fetch origin && git rebase --onto=origin/master origin/old_master_20181015 20181018 18:25:08<+wesdiscordbot> assuming origin is wesnoth/wesnoth 20181018 18:25:42< matthiaskrgr> git reset HEAD~2000 ; git clean -dffx ; git reset --hard HEAD ; git fetch upstrean ; git merge upstream/master 20181018 18:25:45< matthiaskrgr> :P 20181018 18:28:09<+wesdiscordbot> git fetch origin && git reset --hard origin/master 20181018 18:28:19<+wesdiscordbot> is equivalent to what you just did, isn't it 20181018 18:28:37<+wesdiscordbot> background reading https://github.com/wesnoth/wesnoth/issues/1772#issuecomment-429945724 20181018 18:29:27< irker772> wesnoth/wesnoth:1.14 Konrad2 975c11c842 update credits AppVeyor: All builds passed 20181018 19:28:35<+wesdiscordbot> So about 300 commits left to fwdport. 20181018 19:28:44<+wesdiscordbot> looks around for volunteers 20181018 19:28:44-!- TC01 [~quassel@venus.arosser.com] has quit [Ping timeout: 276 seconds] 20181018 19:38:42-!- galegosimpatico [~ec2-user@unaffiliated/ushiu] has quit [Ping timeout: 272 seconds] 20181018 19:41:20-!- galegosimpatico [~ec2-user@unaffiliated/ushiu] has joined #wesnoth-dev 20181018 19:59:07-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20181018 20:20:34< irker772> wesnoth: Severin Glöckner wesnoth:1.14 f47522998306 / data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg: SoF 7: split reinforcements into separate event https://github.com/wesnoth/wesnoth/commit/f4752299830692e054e8518f3848a24b9de83c23 20181018 20:20:36< irker772> wesnoth: Konrad2 wesnoth:1.14 bcde24a4b59e / data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg: SoF 7: explain the Outriders https://github.com/wesnoth/wesnoth/commit/bcde24a4b59ed983938e96a329038708b8c09210 20181018 20:20:38< irker772> wesnoth: Konrad2 wesnoth:1.14 8bfed0644d3e / data/core/ (about.cfg about_i18n.cfg): update credits https://github.com/wesnoth/wesnoth/commit/8bfed0644d3ec1f3cf5f1bc44a1544b55dd2a8e5 20181018 20:20:40< irker772> wesnoth: Severin Glöckner wesnoth:1.14 7e7c74ed6ae3 / data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg: SoF 7: add a time over event https://github.com/wesnoth/wesnoth/commit/7e7c74ed6ae32bf022fb81f3c5960cca562fbd7e 20181018 20:32:25< irker772> wesnoth: Severin Glöckner wesnoth:master 1d6fe7185282 / data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg: SoF 7: split reinforcements into separate event https://github.com/wesnoth/wesnoth/commit/1d6fe71852820f8542f1982312bcb6f30ae97b8c 20181018 20:32:27< irker772> wesnoth: Konrad2 wesnoth:master b9ea2ecf71ea / data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg: SoF 7: explain the Outriders https://github.com/wesnoth/wesnoth/commit/b9ea2ecf71eae40da739fd52aa5eeb22a2373b8f 20181018 20:32:29< irker772> wesnoth: Konrad2 wesnoth:master fd0f7dc1a9a8 / data/core/about_i18n.cfg: update credits https://github.com/wesnoth/wesnoth/commit/fd0f7dc1a9a840283fb2efdcfc6c12938c72b3e6 20181018 20:32:31< irker772> wesnoth: Severin Glöckner wesnoth:master 8300293c534e / data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg: SoF 7: add a time over event https://github.com/wesnoth/wesnoth/commit/8300293c534e5d971073cdc6dd6cfc211b0c17b7 20181018 20:43:05< irker772> wesnoth/wesnoth:master josteph 5098d390a1 Repeat the translation hint for each str AppVeyor: vs2017/Release Failed 20181018 20:43:06< irker772> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/builds/19620144 20181018 20:55:53-!- TC01 [~quassel@venus.arosser.com] has joined #wesnoth-dev 20181018 21:06:14-!- TC01 [~quassel@venus.arosser.com] has quit [Quit: http://quassel-irc.org - Chat comfortably. Anywhere.] 20181018 21:06:24-!- TC01 [~quassel@venus.arosser.com] has joined #wesnoth-dev 20181018 21:10:53< irker772> wesnoth/wesnoth:master newfrenchy83 9951b004ff Update game_lua_kernel.hpp AppVeyor: All builds passed 20181018 21:51:08-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20181018 22:45:54-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 252 seconds] 20181018 22:47:27-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20181018 23:24:41-!- gfgtdf [~gfgtdf@134.76.63.8] has quit [Ping timeout: 276 seconds] 20181018 23:58:57-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 244 seconds] 20181018 23:59:40-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] --- Log closed Fri Oct 19 00:00:45 2018