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

2017-01-17 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/casern_campaign/+merge/314208 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/casern_campaign. ___ Mailing list: https://launchpad.net/~widelands-

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-test-supply-crash into lp:widelands

2017-01-17 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/feature-test-supply-crash/+merge/312422 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/feature-test-supply-crash. ___ Mailing list: https://launc

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

2017-01-17 Thread GunChleoc
This is a great change, thanks for taking it on and staying with it :) -- https://code.launchpad.net/~widelands-dev/widelands/production_statistics/+merge/314283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/production_statistics.

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

2017-01-17 Thread GunChleoc
@toptopple: As I said, the code is in a superclass. Deactivating it for the animals only is more complicated than implementing the ? button, and would lead to really bad code that we would need to remember to rip out again later. I really am in favour of implementing your suggestion, just not in

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

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

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

2017-01-17 Thread GunChleoc
Terrain menus now have a uniform width of 6. Now that I could look at it again, I know why I gave them different width: The second row was all mountains for all tabs. This is now no longer true. Somebody please give it a spin to make sure that this change is indeed better. -- https://code.launc

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-test-supply-crash into lp:widelands

2017-01-17 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/feature-test-supply-crash into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/feature-test-supply-crash/+merge/312422 -- Your team Widelands Developers

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

2017-01-17 Thread kaputtnik
Having the same width of all terrain related tabs is better than switching the window size :-) The width of 6 is not like before, so a bit uncommon, but no showstopper. For my other question i will create another Bug report then, so this can go in. > Is it possible to have images aligned at the

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

2017-01-17 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ Mailing list: http

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

2017-01-17 Thread GunChleoc
Ready to go then :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/unique_ptr_coroutine/+merge/313880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/unique_ptr_coroutine. ___ Mailing list: ht

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

2017-01-17 Thread GunChleoc
Review: Approve Still need to compile & test, code LGTM -- https://code.launchpad.net/~widelands-dev/widelands/economy_save_load_debug/+merge/314453 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy_save_load_debug. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/bug-1399461_error_on_renaming_article into lp:widelands-website

2017-01-17 Thread GunChleoc
Linguistic proofreading done. Diff comments: > > === added file 'templates/wiki/backlinks.html' > --- templates/wiki/backlinks.html 1970-01-01 00:00:00 + > +++ templates/wiki/backlinks.html 2017-01-15 12:03:32 + > @@ -0,0 +1,38 @@ > +{% extends 'wiki/base.html' %} > +{% load wiki

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

2017-01-17 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/critter_editor_categories into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 -- Your team Widelands Developers

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

2017-01-17 Thread TiborB
I implemented the changes, f.e. I changed definition of functions to RequestedWareWorker parse_wares_workers_list(lua_State*, const Widelands::TribeDescr&, Widelands::DescriptionIndex*,

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

2017-01-17 Thread TiborB
OK, it was problem with EOL - I modified the two files on windows. Now the diff is more reasonable. -- https://code.launchpad.net/~widelands-dev/widelands/production_statistics/+merge/314283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/production_statistics

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/bug-1399461_error_on_renaming_article into lp:widelands-website

2017-01-17 Thread kaputtnik
Thanks a lot :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/bug-1399461_error_on_renaming_article/+merge/314033 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~wid

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

2017-01-17 Thread bunnybot
Continuous integration builds have changed state: Travis build 1827. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/192828510. Appveyor build 1665. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_productio