[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands

2017-02-13 Thread bunnybot
Continuous integration builds have changed state: Travis build 1943. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/201326099. Appveyor build 1778. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_165848

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands

2017-02-13 Thread bunnybot
Continuous integration builds have changed state: Travis build 1942. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/201307240. Appveyor build 1777. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_166349

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands

2017-02-13 Thread Notabilis
1) I care. At least a bit. The test map didn't had any fish in the upper part of the pond (Not "0 of 4" but really "none"). So neither the fisher nor the fish breeder can do any work there. But I guess it is a seldom case and can be ignored. 2) Okay, fine by me. I don't think it is important fo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands

2017-02-13 Thread Notabilis
Uh... I think one of us is reading the code wrong. Or maybe the code it behaving strange. As far as I see it: 1) Mark the objective as done (should be moved down to 3) 2) Wait one minute 3) Display dialog that objective is done 4) Wait 15 minutes 5) Start training site objective -- https://code.l

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread GunChleoc
I'm a bit out of my depth with your questions. @SirVer: Do you know anything about this? The fix for the boost issue goes like this, so we might still need to define something somewhere: > Fixed in Git develop: I've added and documented two config macros: > BOOST_MATH_USE_FLOAT128 and BOOST_MA

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands

2017-02-13 Thread GunChleoc
Sounds good to me :) If you have an idea on how to get rid of the compiler warnings elegantly, please do go ahead. They are annoying, but behave differently with the different compilers. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658489-epedition-tab/+merge/317047 Your team Wid

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread Hans Joachim Desserud
>For GCC 4.7, see the following discussion: I agree :) Memo to self: remember to update the minimum required versions on https://wl.widelands.org/wiki/BuildingWidelands/ once this lands. Diff comments: > > === modified file 'CMakeLists.txt' > --- CMakeLists.txt2016-12-04 14:32:55 + >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands

2017-02-13 Thread Klaus Halfmann
Will clean up the code along your comments, thx. Diff comments: > > === modified file 'src/graphic/align.h' > --- src/graphic/align.h 2017-01-25 18:55:59 + > +++ src/graphic/align.h 2017-02-12 13:44:05 + > @@ -24,29 +24,41 @@ > > namespace UI { > > +/** > + * This Enum i

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread GunChleoc
For GCC 4.7, see the following discussion: https://code.launchpad.net/~widelands-dev/widelands/less_compilers/+merge/316897 I wasn't aware that it's specified in CMakeLists.txt as well, could you take care of it? -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Yo

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread Hans Joachim Desserud
Oh, sorry. It looks like I never posted the inline comment before right now. -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands. _

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread Hans Joachim Desserud
Sure, can fix :) Though (see my comment below), I still wonder what happened to GCC 4.7. If the required minimum version has been increased, then CMakeLists.txt and possibly other documentation should be updated alongside. Diff comments: > === modified file '.travis.yml' > --- .travis.yml

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

2017-02-13 Thread GunChleoc
P.S. pgettext means that the same string can be translated in multiple ways. So, _("Foo"); _("Foo"); Will give us 1 message to translate, but pgettext("context1", "Foo"); pgettext("context2", "Foo"); will give us 2 separate messages to translate. -- https://code.launchpad.net/~widelands-dev/wi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands

2017-02-13 Thread GunChleoc
Regarding 2), I had a look at the code now. At the moment, this works only with FindNodeResourceBreedable. For the foresters and gamekeepers, they use FindNodeSpace, which is a different program. We would need to just change the tooltip rather than send an "out of resources" message like we do

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

2017-02-13 Thread GunChleoc
1. I don't have a better idea either. In Firefox, it's "Ctrl++" and "Ctrl+-", so it's the same solution without the blank spaces. 2. Good idea, I have split this. I don't think that we need to mention the zoom though, the user will notice that anyway. The important information here is which hot

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread GunChleoc
We do want GCC_VERSION="4.9" - the only change in the diff should be replacing CLANG_VERSION="3.8" with CLANG_VERSION="4.0" -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/wideland

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

2017-02-13 Thread GunChleoc
_(), ngettext(), pgettext() and pgettext_exp() mark strings as translatable for the gettext translation system. -- https://code.launchpad.net/~widelands-dev/widelands/disambiguate_production_program_names/+merge/316933 Your team Widelands Developers is requested to review the proposed merge of l

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands

2017-02-13 Thread GunChleoc
1) Who cares if there were once fish or not? There are no fish now, that's all the user needs to know. Plus a hint for newbies on how to avoid it in the future. 2) Good idea, I need to have a look at the code to see what needs to be done for that. -- https://code.launchpad.net/~widelands-dev/w

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands

2017-02-13 Thread GunChleoc
Review: Needs Fixing The code for the fix looks good to me - there are quite a lot of other code changes though, and I don't know what they are for (see diff comments). I agree with merging the improved comments. Diff comments: > === modified file 'compile.sh' > --- compile.sh2016-10-2

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands

2017-02-13 Thread GunChleoc
Review: Resubmit My grep results are the same as Notabilis'. I have also added a link to the metaserver code in the comments. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-networking-messages/+merge/316974 Your team Widelands Developers is subscribed to branch lp:~widelands-dev

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands

2017-02-13 Thread GunChleoc
Review: Needs Fixing The proposed fix will make logic know about wui again, which we don't want. Check if you can use UniqueWindowHandler to solve this. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1663490-ship-windows/+merge/317051 Your team Widelands Developers is subscribed to b

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands

2017-02-13 Thread GunChleoc
You can use bzr shelve for resolving conflicts like this. At least the changes are still there :) I'd move msg_boxes(barracks_story_end) before the sleep time, or split up the sleep time. The way it is now, it will take a long time for the player to receive the confirmation, and it will be fo