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

2018-08-10 Thread Toni Förster
Toni Förster has proposed merging lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior. Requested reviews: hessenfarmer (stephan-lutz) For more details, see: https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed

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

2018-08-10 Thread Toni Förster
The proposal to merge lp:~stonerl/widelands/big_inn_missing_animation into lp:~widelands-dev/widelands/mines-worldsavior has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation/+merge/352844 -- Your

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

2018-08-10 Thread Toni Förster
Hope this is what you imagined. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing list: https

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

2018-08-10 Thread Toni Förster
Yes, no problem. But I found a severe problem regarding production times: https://wl.widelands.org/forum/post/25597/ This also affects the inns. > On 10. Aug 2018, at 22:36, hessenfarmer wrote: > > Review: Approve > > exactly. Thanks a lot. Just a quick question: > > Ican't do any changes un

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

2018-08-10 Thread Toni Förster
> exactly. Thanks a lot. Just a quick question: > > Ican't do any changes until Monday as I am not at home, could you do the same > for empire and frisians buildings as well? > If yes we should wait with the merge. If no this can go in. Done. -- https://code.launchpad.net/~stonerl/widelands/big_

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

2018-08-11 Thread Toni Förster
Changed it according to your description. -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing l

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

2018-08-11 Thread Toni Förster
Review: Approve Works forme, tested this on macOS 10.13.6. -- https://code.launchpad.net/~widelands-dev/widelands/odd_locale_fix/+merge/352934 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/odd_locale_fix. ___ Maili

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

2018-08-11 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/minimize_time_for_return_skipped into lp:~widelands-dev/widelands/mines-worldsavior. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands

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

2018-08-11 Thread Toni Förster
@bunnybot merge -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing list: https://launchpad.net

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

2018-08-12 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/minimize_time_for_return_skipped into lp:~widelands-dev/widelands/mines-worldsavior has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/minimize_time_for_return_skip

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

2018-08-12 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/minimize_time_for_return_skipped into lp:~widelands-dev/widelands/mines-worldsavior. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1786613 in widelands: "production times are 10s longer when r

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder into lp:widelands

2018-08-12 Thread Toni Förster
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder/+merge/352874 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784490-show-version-in-mac-finder into lp:widelands. ___

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

2018-08-12 Thread Toni Förster
No problem at all gonna close this on and open a new one against trunk. -- https://code.launchpad.net/~widelands-dev/widelands/minimize_time_for_return_skipped/+merge/352938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/minimize_time_for_r

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

2018-08-12 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/minimize_time_for_return_skipped into lp:~widelands-dev/widelands/mines-worldsavior has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/minimize_time_for_return_skippe

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1785404-chat-scrolling into lp:widelands

2018-08-12 Thread Toni Förster
Review: Approve Works for me. Tested on macOS 10.13. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1785404-chat-scrolling/+merge/352941 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1785404-chat-scrolling. ___

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

2018-08-12 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/macos_build_app into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/macos_build_app/+merge/352945 -- Your team Widelands Developers

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

2018-08-13 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/macos_build_app into lp:widelands has been updated. Commit message changed to: The script for building on macOS uses gcc-7 now. Also it checks whether the SDK10.7 is installed or not and uses the latest installed version if it cannot find the o

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

2018-08-13 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands. Commit message: Reduce waiting time to 10ms for skipped programs. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1786613 in widelands: "produ

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

2018-08-13 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands. Commit message: reduce waiting time to 10ms for skipped programs Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1786613 in widelands: "production

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

2018-08-13 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/missing_animations_barbarians_wood_hardener into lp:~widelands-dev/widelands/mines-worldsavior. Commit message: Use working animations for the barbarians wood hardener. They where in place but idle animation were used instead

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

2018-08-13 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/remove_executable_bit into lp:widelands. Commit message: remove executable bit from files that are not supposed to have it Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

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

2018-08-13 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/352967 -- Your team Widel

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1786613-500ms-return-skipped into lp:widelands

2018-08-13 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-500ms-return-skipped into lp:widelands. Commit message: reduce waiting time to 500ms for skipped programs Requested reviews: hessenfarmer (stephan-lutz) Related bugs: Bug #1786613 in widelands: "production time

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

2018-08-13 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/macos_build_app_compiler into lp:widelands with lp:~widelands-dev/widelands/macos_build_app as a prerequisite. Commit message: choose between Clang and GCC Requested reviews: Widelands Developers (widelands-dev) For more details

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

2018-08-13 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/macos_build_app_compiler into lp:widelands has been updated. Commit message changed to: choose between compiler clang or gcc, specify build type: debug or release For more details, see: https://code.launchpad.net/~widelands-dev/widelands/macos_b

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

2018-08-13 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/macos_build_app_compiler into lp:widelands has been updated. Description changed to: One can choose between Clang and GCC now. The Wiki has been changed accordingly: https://wl.widelands.org/wiki/Building Widelands on macOS/ For more details, s

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

2018-08-13 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/macos_build_app_compiler into lp:widelands has been updated. Description changed to: One can choose between Clang and GCC now. The Wiki has been changed accordingly: https://wl.widelands.org/wiki/BuildingWidelandsonmacOS/ For more details, see:

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

2018-08-13 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/macos_build_app_compiler into lp:widelands has been updated. Description changed to: One can choose between Clang and GCC now. The Wiki has been changed accordingly: https://wl.widelands.org/wiki/Building_Widelands_on_macOS/ For more details, s

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

2018-08-14 Thread Toni Förster
> Looks good from my side now. > Would be good though if somebody with an underpowered machine would confirm > minimal effect on performance Do you think it gets much more underpowered. Your processor is basically the same as mine. Just a few MHz slower. The only difference is RAM. -- https://co

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

2018-08-14 Thread Toni Förster
$ ./build_app.sh clang debug ../macos_build_app_compiler gives me this output later on -- Using AddressSanitizer http://clang.llvm.org/docs/AddressSanitizer.html So it is using it without explicitly declaring it. Does work with clang. gcc currently gives me headaches, though. It seems to use th

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

2018-08-14 Thread Toni Förster
Here are the clang builds: http://fosuta.org/widelands_64bit_r8786.dmg http://fosuta.org/widelands_64bit_r8786_Debug.dmg -- https://code.launchpad.net/~widelands-dev/widelands/macos_build_app_compiler/+merge/353035 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wideland

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

2018-08-15 Thread Toni Förster
@Klaus is there something like "brew --prefix" for MacPorts? We could easily adapt the script to handle both package manager. Also ASsam is enabled by default for debug builds in the "CMakeLists.txt" That's why I havn't had to enable it for debug. I disabled it for GCC, though. -- https://cod

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

2018-08-15 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/macos_build_app_compiler into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/macos_build_app_compiler/+merge/353035 -- Your team Widelands De

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

2018-08-15 Thread Toni Förster
I just added a check for ccache and added gettext to $PATH to avoid force linking it (removed thsi line from the wiki). Also merged from trunk. ASan stays disabled for GCC since it does not pass the test and throws error like this one: Start 1: test_economy 1/4 Test #1: test_economy ...

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

2018-08-15 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/macos_build_app_compiler into lp:widelands with lp:~widelands-dev/widelands/macos_build_app as a prerequisite. Commit message: choose between compiler clang or gcc, specify build type: debug or release Requested reviews: Klaus

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

2018-08-16 Thread Toni Förster
The atlantian's crystalmine has the sleep between the conditional "return=skipped" and "consume" while all other mines(for all tribes) have it before the return=skipped. Which one is correct? Also I remember that this penalty was removed e.g. for the taverns. Why is it still in place for all the

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1786613-500ms-return-skipped into lp:widelands

2018-08-20 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1786613-500ms-return-skipped into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-500ms-return-skipped/+merge/353028 -- Your team W

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

2018-08-20 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands. Commit message: check for whether the program name is work or not. Requested reviews: hessenfarmer (stephan-lutz) Related bugs: Bug #1786613 in widelands: "production time

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

2018-08-20 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353437 -- Your team Widel

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

2018-08-20 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands with lp:~widelands-dev/widelands/mines-worldsavior as a prerequisite. Commit message: check for whether the program name is work or not. Requested reviews: hessenfarmer (stephan

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

2018-08-20 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior. Commit message: streamlined sleep times for mines Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

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

2018-08-20 Thread Toni Förster
@SirVer, sorry for breaking your workflow. -- https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands. _

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

2018-08-21 Thread Toni Förster
I if you want I can merge this into world-saviors branch myself. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___

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

2018-08-21 Thread Toni Förster
Review: Approve > I have now pushed a fix for Linux. Does it still work for the OSX nightlies? It does for me. -- https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_osx_nightl

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

2018-08-21 Thread Toni Förster
New revision. We check whether the program is "work" or end with "work". This would work with the marble mines as well. Now if a program shall not calculate stats, only append _work at the end. Here is the aforementioned marble-mine: work = { -- TRANSLATORS: Completed/Skipped/Did

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

2018-08-21 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353449 -- Your team Widel

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

2018-08-21 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands with lp:~widelands-dev/widelands/mines-worldsavior as a prerequisite. Commit message: introduced the return value no_stats for work programs. Requested reviews: hessenfarmer

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

2018-08-21 Thread Toni Förster
Ok, I'm pretty sure that this is the final solution :-D Unconditional "return=skipped" need to be replaced with "return=no_stats". That's it no stats are calculated and it also handles the conditional skips. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+m

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

2018-08-21 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/multiplayer-ui into lp:widelands. Commit message: multiplayer-ui fine tuning Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/multiplayer-ui/+merge

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

2018-08-21 Thread Toni Förster
I branched this one from trunk. That's why this branch depends on mines-worldsavior. As soon as that one gets merged into trunk, I'm gone rebase this one here, to avoid merge conflicts. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your team

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

2018-08-21 Thread Toni Förster
I just merged the mines-worldsavior into this one and replaced the return=skipped with return=no_stats. So as soon as worldsavior's branch gets merged into trunk this one here is ready to go. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your

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

2018-08-22 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/skipped_statistics into lp:widelands with lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped as a prerequisite. Commit message: skipping a work program decreases productivity accordingly Requested reviews: Widelands

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

2018-08-22 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/skipped_statistics into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/skipped_statistics/+merge/353552 -- Your team Widelands Developers is requeste

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

2018-08-22 Thread Toni Förster
Review: Disapprove -- https://code.launchpad.net/~widelands-dev/widelands/skipped_statistics/+merge/353552 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped. ___ Mailing list: https://la

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

2018-08-23 Thread Toni Förster
One question regarding the shipyards. It takes 16 steps to complete a ship. But 20 to reach 100% productivity. That somehow doesn't feel right; having built an entire ship but only 80% productivity. What about moving the animation to the work program and remove the return from there to have sta

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

2018-09-02 Thread Toni Förster
I already had a look at some of the changes made here. From my side it looks okay so far. Any particular I have to look at? -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mi

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

2018-09-03 Thread Toni Förster
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing list: https://launchpad.net/~

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

2018-09-03 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/shipyard_statistics into lp:widelands with lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped as a prerequisite. Commit message: change order of working and stats for shipyards Shipyards call 2 programs and productivity is

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

2018-09-06 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands. Commit message: introduced the return value no_stats for work programs. Requested reviews: hessenfarmer (stephan-lutz) Related bugs: Bug #1786613 in widelands: "production

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

2018-09-06 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 -- Your team Widel

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

2018-09-06 Thread Toni Förster
I removed the mines_worldsavior-branch and brought it on par with latest trunk. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. __

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

2018-09-06 Thread Toni Förster
branched it of from the "new" bug-1786613-10s-return-skipped branch. -- 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-skipped. ___

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

2018-09-06 Thread Toni Förster
Doesn't depend on lp:~widelands-dev/widelands/mines-worldsavior anymore, but couldn't remove it as a prerequisite. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wideland

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

2018-09-07 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/big_inn_missing_animation into lp:widelands. Commit message: added missing working animation for barbarians big_inn Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

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

2018-09-07 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/animation_woodhardener into lp:widelands. Commit message: Use working animations for the barbarians wood hardener. They were in place but idle animation were used instead. Requested reviews: Widelands Developers (widelands-dev

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

2018-09-07 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/macos_build_app_ICU into lp:widelands. Commit message: check for minor version of CMake only export ICU_ROOT if CMake version is lower than 3.12 Requested reviews: Widelands Developers (widelands-dev) For more details, see

Re: [Widelands-dev] Deleted branches on merge requests will knock out bunnybot

2018-09-08 Thread Toni Förster
Hi all, I'm not sure if it could be one of my branches. Although I didn't delete my branches, I overwrote one because I removed 2 commits. Does this count as deleting as well? If so, are there any actions required or do we just have to wait for the 🐰 bot to be up und running, again? Best ston

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

2018-09-09 Thread Toni Förster
The prerequisite got merged. @bunnybot merge -- 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-skipped. __

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

2018-09-10 Thread Toni Förster
I do have one question regarding the empire. The armorsmithy produces 2 armor_helmet with the changes made in this branch, instead of one. The question I have is: why does the trainingcamp need helmets? The soldiers are already equipped with one. The barbarians for example don't have a helmet w

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

2018-09-26 Thread Toni Förster
The version isn't shown on macOS either: The "RESULT_VARIABLE" says: No such file or directory So the command does not seem to be executed and therefore WL_Version is empty. -- https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586 Your team Widelands Developers

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

2018-09-26 Thread Toni Förster
Sorry for the spam. This line needs to be removed: WORKING_DIRECTORY ${MAKE_CURRENT_SOURCE_DIR} -- https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_duplicate_code.

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

2018-09-26 Thread Toni Förster
The cmake warning is caused by Tino's "Quickfix" at revision 8853 in trunk. These lines in BzrRevision.cmake trigger it the policy: string(REGEX REPLACE "\n|\r$" "" WL_VERSION "${WL_VERSION}") string(STRIP WL_VERSION "${WL_VERSION}") file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/VERSION "${WL_VERSION}"

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

2018-09-26 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/cmake_errors_WL_VERSION into lp:widelands. Commit message: explicitly set CMP0054 to fix warning Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

2018-09-26 Thread Toni Förster
Review: Approve Tested it; and it works as advertised. -- https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl/+merge/355002 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/soldier-capacity-ctrl. ___

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

2018-09-27 Thread Toni Förster
@Tino I get this warning with Cmake 3.12 on macOS. We're not silencing the warning. We just tell Cmake explicitly to use the new behavior. -- https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728 Your team Widelands Developers is subscribed to branch lp:~wide

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

2018-10-02 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/cmakepolicy into lp:widelands. Commit message: set cmake_policy version range to NEW instead of specific policy: https://cmake.org/cmake/help/v3.12/command/cmake_policy.html Requested reviews: kaputtnik (franku) Related bugs

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

2018-10-02 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/cmakepolicy into lp:widelands has been updated. Description changed to: We set the policy CMP0054 to NEW since it was not set. Since I stumbled over bug #1772079 I thought it might be better to set a range instead of every single policy (which

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

2018-10-06 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/macos_build_app_SDK into lp:widelands. Commit message: Use MacOSX.sdk if an appropriate versioned SDK can't be found. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpa

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

2018-10-06 Thread Toni Förster
I set a fixed version now: 3.9.2. That's the one that is used to compile the macOS nightlies. The Version range does not seem to work as describe, although it should be backwards-compatible (maybe I just misread something) This does not fix the warning kaputtnik reported. Apparently Widelands ca

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

2018-10-08 Thread Toni Förster
@kaputtnik I know. The warning you get, can't be resolved be simply setting cmake_policy to 3.10 or newer (as I naively thought). Doing so would result in using the new GLVND-libs (which is desired), but apparently widelands currently can't be compiled using these libraries. See the linking err

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

2018-10-11 Thread Toni Förster
@GunChleoc But that does not solve the underlying issue, does it? Setting: cmake_policy(SET CMP0072 OLD) is the same as not setting the policy at all. In both will result in: OpenGL_GL_PREFERENCE=LEGACY The first one though would silence the warning BUT we would run into issues with Cmake ve

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

2018-10-11 Thread Toni Förster
@kaputtnik can you give this another try? -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchp

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

2018-10-11 Thread Toni Förster
@kaputtnik the changes I made set the policy to NEW. The trick that it. did were the additional linker options. But it broke travis builds and will throw errors on system that use old cmake version. Your proposed switch sets it to the old (deprecated) behavior. Would you be so nice and test the

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

2018-10-11 Thread Toni Förster
Btw. AFAIK when using the new behavior, it seems mandatory to set the linker-flags. See here: https://stackoverflow.com/questions/23729213/link-error-when-trying-to-build-a-simple-opengl-program -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands

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

2018-10-11 Thread Toni Förster
@kaputtnik you could try to remove the linker flags bit by bit and see which one is really necessary to compile without linker errors. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelan

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

2018-10-12 Thread Toni Förster
Thanks allot. I changed the the line for the linker flags. > From my understanding your change will use GLVND on my system. Wouldn't this > make bug hunting a > bit more complicated, because some bugs may appear on systems using the > legacy GL driver but not > on systems using GLVND libraries?

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

2018-10-13 Thread Toni Förster
That, I cannot answer. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.net/~widelands-d

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

2018-10-13 Thread Toni Förster
I guess I found an answer :D @kaputtnik can you try again, please? -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mai

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

2018-10-13 Thread Toni Förster
Would you be so kind and test again? -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.ne

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

2018-10-14 Thread Toni Förster
It seems so. We would need someone with 18.10 (hasn't been released though) to test. If no one objects I would append these flag: "-lGLU -lGLEW -lglut" and push directly to trunk. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is

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

2018-10-14 Thread Toni Förster
It is using the wrong libraries... libGL.so: error adding symbols: DSO missing from command line That's the legacy library. Maybe we need to point to he correct library like so: -lGL /usr/lib/x86_64-linux-gnu/libOpenGL.so -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge

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

2018-10-14 Thread Toni Förster
I was wrong about the library. Still no clue as to why it does not compile on 18.10 -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. __

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

2018-10-15 Thread Toni Förster
I installed 18.10 in a virtual machine. The problem seems to be cause by GCC-8 which, is standard on 18.10. Compiling with Clang shows no problems at all. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~w

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

2018-10-15 Thread Toni Förster
When running the compile.sh script one of the very first line should tell you which compiler is used. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy.

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

2018-10-15 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/GLVND_18_10 into lp:widelands. Commit message: set CMP0072 to OLD for Ubuntu 18.10 Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1772079 in widelands: "CMake 3.11: warning about FindOpenGL&quo

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

2018-10-15 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/GLVND_18_10 into lp:widelands has been updated. Commit message changed to: set CMP0072 to OLD for Ubuntu 18.10 when using GCC For more details, see: https://code.launchpad.net/~widelands-dev/widelands/GLVND_18_10/+merge/356771 -- Your team Wide

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

2018-11-05 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/number_of_cpus into lp:widelands. Commit message: correctly calculate the number of cpus on macOS Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1800814 in widelands: "update.sh script broken sin

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

2018-11-06 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug_1801340_loading_screen into lp:widelands. Commit message: always set background for progresswindow to left bottom Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1801340 in widelands: "Pictu

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

2018-11-06 Thread Toni Förster
Will do this later. Didn't consider those, though. So I guess they'll look worse now... -- https://code.launchpad.net/~widelands-dev/widelands/bug_1801340_loading_screen/+merge/358378 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_180

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

2018-11-06 Thread Toni Förster
Barbarians look good in 1280x800 but that's the maximum resolution I can test. Any way to unlock all campaigns without playing them? -- https://code.launchpad.net/~widelands-dev/widelands/bug_1801340_loading_screen/+merge/358378 Your team Widelands Developers is requested to review the proposed m

  1   2   3   4   5   >