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

2018-02-17 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_militarysites_prohibited. ___ Mailing list: https://l

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1740141-map-horizon into lp:widelands

2018-02-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 3182. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/342509354. Appveyor build 2991. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_174014

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

2018-02-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 3183. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/342511097. Appveyor build 2992. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fix

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

2018-02-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 3184. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/342512052. Appveyor build 2993. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_militar

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

2018-02-17 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822 -- Your team Widelands Develo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread GunChleoc
I have left a comment in the bug - I think we need one more small building plot. If you want to rename the map directory, please use bzr mv. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch

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

2018-02-17 Thread R M
I seem to remember a forum discussion, some time ago, about some maps needing small buildings to conquer mountains as large plots were to far away and resources could not be mined. -- https://code.launchpad.net/~widelands-dev/widelands/frisians/+merge/336910 Your team Widelands Developers is su

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

2018-02-17 Thread noreply
The proposal to merge lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 -- Your team Widelands Developers

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website

2018-02-17 Thread kaputtnik
This merged and deployed now. Thanks Trimard for this feature and being that patient with my slow answers :-) -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is subscribed to branch lp:widelands-website. __

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

2018-02-17 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/auto_copyr_year into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/auto_copyr_year/+merge/337911 Set the last y

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread kaputtnik
I think this is ok. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-maps-multiplayer into lp:widelands

2018-02-17 Thread GunChleoc
I have tested Island Hopping now. Smugglers still needs a full test. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-maps-multiplayer/+merge/337506 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-maps-multiplayer into lp:widel

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

2018-02-17 Thread Evgeny Kapun
Evgeny Kapun has proposed merging lp:~abacabadabacaba/widelands/bug1749586 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1749586 in widelands: "Fish breeder can't breed fish if the game is loaded after all fish is caught" https://bugs.launchp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands has been updated. Commit Message changed to: Minor fixes to Last Bastion map. See LP bug 1669230 for details. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669

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

2018-02-17 Thread GunChleoc
I have done some proofreading on the tribe's units. Will do the scenarios some other time. Best look at the diff to see if you agree with my changes - there are also some NOCOM comments in there for discussion. 2 more things: 1. I don't like "(Master) Seamstress" as the name of a building. The

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

2018-02-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 3187. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/342514546. Appveyor build 2996. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_tutori

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread Teppo Mäenpää
When may I conclude that bunnybot has, once again, decided not to merge. What is the problem this time? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-166

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread Teppo Mäenpää
Oh, I forgot that you did a merge. We might be waiting for travis and appveyor. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread GunChleoc
Yep, Travis still has some catching up to do, because Bunnybot had indeed gotten confused due to problems with Launchpad. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev

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

2018-02-17 Thread GunChleoc
Review: Approve Code LGTM, not tested. -- https://code.launchpad.net/~widelands-dev/widelands-website/auto_copyr_year/+merge/337911 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~wi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread GunChleoc
Codecheck failure is already in trunk, so it needs to be fixed there @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbast

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

2018-02-17 Thread TiborB
TiborB has proposed merging lp:~widelands-dev/widelands/ai_colonization_update into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_colonization_update/+merge/337913 Changes to AI in regard to

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

2018-02-17 Thread TiborB
TiborB has proposed merging lp:~widelands-dev/widelands/ai_fisher_identification into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_fisher_identification/+merge/337914 AI tweak - a production

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

2018-02-17 Thread TiborB
I am afraid that in a next tribe the fishers will have an input - worms or something like that and we will be reworking this again :( -- https://code.launchpad.net/~widelands-dev/widelands/ai_fisher_identification/+merge/337914 Your team Widelands Developers is requested to review the proposed me

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

2018-02-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 3189. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/342516094. Appveyor build 2998. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_maps_pl

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

2018-02-17 Thread TiborB
re: "Add a new hint supporter_required..." - yes, this sound good to me, I can do it and should not be that complicated. Just dont forget about possible conflicts with basic economy stuff (supported building is a basic, but supporter is not) -- https://code.launchpad.net/~widelands-dev/wideland

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

2018-02-17 Thread Benedikt Straub
The claypit/aquafarm relation is exactly the other way around – the clay pit is basic, the aqua farm should be built only later in the game. The point here is that building an aqua farm makes no sense at all if there is no (working) clay pit nearby… @GunChleoc: Thanks for the proofreading, you

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

2018-02-17 Thread GunChleoc
How about having a weight instead? If building type has no inputs, prefer it if you can find a suitable spot. -- https://code.launchpad.net/~widelands-dev/widelands/ai_fisher_identification/+merge/337914 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-de

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

2018-02-17 Thread GunChleoc
Review: Approve Code LGTM, jut 2 questions regarding the comments - see NOCOM in my commit. Not tested yet. -- https://code.launchpad.net/~widelands-dev/widelands/ai_colonization_update/+merge/337913 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_colonizat