[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands

2019-08-29 Thread bunnybot
Continuous integration builds have changed state: Travis build 5359. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/578495337. Appveyor build 5129. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-512

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1841471-close-dropdowns-with-parent-windows into lp:widelands

2019-08-29 Thread bunnybot
Continuous integration builds have changed state: Travis build 5358. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/578358022. Appveyor build 5128. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_18414

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/new-shipping into lp:widelands

2019-08-29 Thread kaputtnik
got another detour assert: /widelands-repo/new-shipping/src/economy/fleet.cc:890: void Widelands::Fleet::check_push_destination(Widelands::Game&, Widelands::Ship&, const Widelands::PortDock&, Widelands::PortDock&, uint32_t): Zusicherung »detour >= base_length« nicht erfüllt. Abgebrochen (Speich

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands

2019-08-29 Thread GunChleoc
I have pushed another commit with code review. I'm done with this for now. I also did a grep on data and test for lua changes, and it looks like we didn't miss anything. The following 2 bits in the code are a bit complicated and could do with testing: * worker creation over multiple economies

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/new-shipping into lp:widelands

2019-08-29 Thread bunnybot
Continuous integration builds have changed state: Travis build 5356. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/578276856. Appveyor build 5126. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_new_shippi

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1841471-close-dropdowns-with-parent-windows into lp:widelands

2019-08-29 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1841471-close-dropdowns-with-parent-windows into lp:widelands. Commit message: Fix deleting of dropdown lists in UniqueWindow and Player Menu. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1841471 in

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/new-shipping into lp:widelands

2019-08-29 Thread Benedikt Straub
The "detour >= base_length" assert should finally be fixed. Also changed the double-colonization check as suggested. -- https://code.launchpad.net/~widelands-dev/widelands/new-shipping/+merge/371155 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-shipping.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands

2019-08-29 Thread GunChleoc
I have pushed a new commit with a code style review. I'll have to return later to go through the discussion. -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands

2019-08-29 Thread Benedikt Straub
I just had an idea how I might just perhaps be able to write savegame compatibility, give me a few days to try it out... -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/new-shipping into lp:widelands

2019-08-29 Thread GunChleoc
I had a look at the check for disallowing double colonization. I think it would be sufficient to check whether there's a building there, we don't care if it's a port or a construction site. It might even be safer, because the enemy might also have been faster with building something there. -- h