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

2018-09-05 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/const_portdock_fleet_and_ship_functions into lp:widelands. Commit message: Made as many functions as possible const in portdock, fleet and ship and followed the snowball effect Requested reviews: Widelands Developers (widelands-dev)

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

2018-09-05 Thread GunChleoc
The Linux builds in Travis could not handle the new Boost header, while the Mac builds could. I think having a switch for the Boost versions is still a good idea. Document the changes needed for glbinding in the bug, call it "modernize glbinding" or something and retarget it to Build 21? I hav

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

2018-09-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 3896. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/424652169. Appveyor build 3694. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_f

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

2018-09-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 3897. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/424658912. Appveyor build 3695. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_wor

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

2018-09-05 Thread GunChleoc
Review: Approve LGTM :) We have to wait for your other branch before we can merge this though. -- https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipp

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

2018-09-05 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/scout-compatibility into lp:widelands. Commit message: Remove savegame compatibility for scouts. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/scout-

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

2018-09-05 Thread hessenfarmer
ok I think I found a cool solution for glbinding as well. Let's wait for the CI results and then review please. Locally it took Glbinding 3 code and boost 1.66 code (had to downgrade this as I am on Win10) so in msys2 environment the switches are working. -- https://code.launchpad.net/~wideland

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

2018-09-05 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/gdpr_1 into lp:widelands-website. Commit message: Removed google analytics and PayPal, make some fields optional in the contact form. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1780536 in Wide

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

2018-09-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 3899. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/424681733. Appveyor build 3697. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_const_portd

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

2018-09-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 3900. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/424720301. Appveyor build 3698. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_shipyard_s

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

2018-09-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 3901. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/424900021. Appveyor build 3699. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_scout_comp

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

2018-09-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 3902. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/424998557. Appveyor build 3700. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_

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

2018-09-05 Thread GunChleoc
Review: Needs Fixing The wares cannot be fixed without a bug overhaul of the production program code, and it's too late in the release cycle to do that now. The only alternative would be some really really ugly hacks, which I don't want to do. The problem is that the consumed wares are not in t

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

2018-09-05 Thread GunChleoc
The mines_worldsavior branch is blocked. Can you create a fresh branch off trunk, so that we can merge this? -- https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands

2018-09-05 Thread GunChleoc
The mines_worldsavior branch is blocked. Can you create a fresh branch off trunk with the changes that are independent of that branch, so that we can get them in for Build 20? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your team Widelands