Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands

2018-09-27 Thread Klaus Halfmann
OK cleanup_playerimmovables_area was duplicate code and moved to do_conquer_area(). -- https://code.launchpad.net/~widelands-dev/widelands/bug-858292-military-influence/+merge/353834 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-858

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

2018-09-27 Thread hessenfarmer
Ok shall we remove master miners from frisian village as well in this case? I can do this tonight, but if you want to do it feel free. Diff comments: > > === modified file > 'data/tribes/scripting/starting_conditions/barbarians/village.lua' > --- data/tribes/scripting/starting_conditions/barbar

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

2018-09-27 Thread GunChleoc
Sgrìobh hessenfarmer na leanas 27/09/2018 aig 08:26: > Ok shall we remove master miners from frisian village as well in this case? > I can do this tonight, but if you want to do it feel free. Yes, please -- https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358 You

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands

2018-09-27 Thread GunChleoc
Yep. the actual fix is: player_area.radius += 2; -- https://code.launchpad.net/~widelands-dev/widelands/bug-858292-military-influence/+merge/353834 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelan

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

2018-09-27 Thread GunChleoc
Review: Approve LGTM :) @bunnbot merge -- https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmake_errors_WL_VERSION. ___ Mailin

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

2018-09-27 Thread GunChleoc
This removal of ports and ships simulated actions that can be taken by a user, so yes, the new code needs to be able to deal with that. Users can sink ships and destroy ports. Ports can also be destroyed if the enemy conquers the territory. -- https://code.launchpad.net/~widelands-dev/widelands

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

2018-09-27 Thread GunChleoc
Thanks! Since we're in feature freeze, merging will have to wait until after Build 20. -- 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/detect_revision_update into lp:widelands

2018-09-27 Thread GunChleoc
Appveyor builds are working, compiling from Git on Linux will not. We have to wait for https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728, merge in trunk and then test again. -- https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+me

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-fail-gracefully-on-graphics-driver-problems into lp:widelands

2018-09-27 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1536377-fail-gracefully-on-graphics-driver-problems into lp:widelands. Commit message: Show a basic SDL error message box to the user if the shading language can't be detected or is too old. Requested reviews: Widelands Developer

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

2018-09-27 Thread Tino
No, the cmake warning is not causing the failure. I've updated the whole function, should work on every os... -- https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+merge/355590 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/detect_revis

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

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

2018-09-27 Thread ypopezios
Are you sure that there is proper simulation of user-actions here? Cause I suspect that there is just a magical removal, without calling e.g. sinking function. Of course the code should cover cases of destruction, but how to do that if it is not properly called? The old code was checking every t

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

2018-09-27 Thread GunChleoc
Yes, the simulation should be correct. Calling the sink_ship function is calling the sink_ship function, and it doesn't matter if the caller is a Lua script or a UI button. Both will send off the same player command. If they don't, it's a bug. And yes, we do want Widelands not to get into an un

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-fail-gracefully-on-graphics-driver-problems into lp:widelands

2018-09-27 Thread bunnybot
Continuous integration builds have changed state: Travis build 4055. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/434035449. Appveyor build 3851. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_15363

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

2018-09-27 Thread Benedikt Straub
Please also remove the master seamstress from the frisian village start. Other than that, changes look good to me :) -- https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/per-level-soldier-anims into lp:widelands

2018-09-27 Thread bunnybot
Continuous integration builds have changed state: Travis build 4058. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/434041227. Appveyor build 3854. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_per_level_

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

2018-09-27 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmake_errors_WL_VERSION. ___ Mailing list: https://launchpad

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

2018-09-27 Thread GunChleoc
@bunnbot merge -- https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmake_errors_WL_VERSION. ___ Mailing list: https://launchpad.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-27 Thread Klaus Halfmann
OK after cleaning my confusion about the two builds I will try a 2xWIN/ 2xOSX Smugglers game. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747 Your team Widelands Developers is requested to review the proposed merge of lp:~widela

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

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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-27 Thread Klaus Halfmann
When trying to Debug WIndows I gita Problem with system.out, as described in: #1398536 I will try to debug this anyway -- https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747 Your team Widelands Developers is requested to review the