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

2018-01-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 3117. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/335329642. Appveyor build 2924. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_portspa

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

2018-01-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 3116. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/335191405. Appveyor build 2923. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_empire

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

2018-01-30 Thread TiborB
trunk merged, not tested, but there were no conflicts -- https://code.launchpad.net/~widelands-dev/widelands/ai_portspaces/+merge/335785 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_portspaces. ___ Mailing list:

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

2018-01-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 3115. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/335189279. Appveyor build 2922. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_empire3

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands

2018-01-30 Thread hessenfarmer
We could do so. But I had a look on the diffs of your branch against trunk. As there are only changes in texts.lua they will be overwritten anyhow by my branch. So it is your decision whether to merge your branch first or to skip it. -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-

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

2018-01-30 Thread weedfreak
I have redone a lot of this branch, moving most work into existing buildings or upgrades of existing buildings. This was working a lot better with AI players, they stopped spamming 30 or 40 recycle buildings with no workers or wares to process. I cannot test further as I cannot build any of the

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

2018-01-30 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands has been updated. Commit Message changed to: Converted Empire Scenario 2 to new font renderer. Also, allow warehouse and donkeyfarm so that players can speed up the scenario if they want. For more details, see: htt

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

2018-01-30 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-empire3 into lp:widelands. Commit message: Converted Empire Scenario 3 to new font renderer Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1-emp

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

2018-01-30 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands. Commit message: Converted Empire Scenario 2 to new font renderer Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1-emp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands

2018-01-30 Thread GunChleoc
Maybe we should merge my branch first, to make sure that we won't miss any of the textual changes? I'll get it ready. -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands

2018-01-30 Thread hessenfarmer
So I'll leave the text as it is. Will try to test scenario 4 this evening. Sorry but I couldn't spare any time over the weekend yet. @GunChleoc there were some C# code changes in your original branch for introducing the new font renderer to empire 3 which are not part of this branch. So either

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

2018-01-30 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_encyclopedia into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_encyclopedia/+merge/336788 -- Your team Widelands Developers is subscribed to

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

2018-01-30 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/ai_seafaring_fix into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_seafaring_fix/+merge/335672 -- Your team Widelands Developers is subscribed to

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

2018-01-30 Thread GunChleoc
We are still a few months off freezing for Build20, since there are some UI changes & fixes that need to go in first. I agree on not working on graphics until the idea is accepted, it would be a waste of your valuable time. I'll have to wait until I get home before I can do some test playing -

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

2018-01-30 Thread GunChleoc
Review: Approve Tested. Travis unable to fetch some archives. @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/fix_encyclopedia/+merge/336788 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_encyclopedia. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands

2018-01-30 Thread GunChleoc
I'm not a big Java thing, but I guess that's one thing they did better, that you have to declare explicitly which exceptions can be thrown by a function. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to b

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

2018-01-30 Thread GunChleoc
Transient failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/ai_seafaring_fix/+merge/335672 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_seafaring_fix. ___ Mailing li

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

2018-01-30 Thread GunChleoc
I tried the 32 bit version now, no joy. Can you merge trunk again to trigger a new AppVeyor build? Maybe that will help. -- https://code.launchpad.net/~widelands-dev/widelands/ai_portspaces/+merge/335785 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_portsp