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

2018-11-23 Thread GunChleoc
Review: Resubmit We already had to add some strings for other bug fixes. I think breaking the string freeze for smaller strings is OK, as long as we don't overdo it. I have addressed all the points in the code review now. We can't check for duplicate keys in Lua tables, because the backend (Eri

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/handling-various-fs-errors into lp:widelands

2018-11-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/handling-various-fs-errors into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/handling-various-fs-errors/+merge/358767 -- Your team Widelands Develope

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

2018-11-23 Thread GunChleoc
Thanks for your math wizardry - I have now implemented both suggestions. I think that greatly cutting the precision while forcing a uniform rounding strategy (round down) should be good enough for our purposes. Let's merge this and see if we're still getting desyncs. We can always decide to chan

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

2018-11-23 Thread hessenfarmer
Ok I will test this tonight and merge if ok. in the diff here on Launchpad there are some differing indentations? are they intentional? Anyhow I have marked them in the diff comments Diff comments: > > === modified file 'src/logic/map_objects/tribes/building.cc' > --- src/logic/map_objects/tr

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1802629-territorial-crash into lp:widelands

2018-11-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1802629-territorial-crash into lp:widelands. Commit message: In territorial win conditions, remember the winning player's name in case the player got defeated a few milliseconds before the name is queried. More checks for defeated p

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

2018-11-23 Thread GunChleoc
Indentations will be fixed by bunnybot. I have set my IDE back to tabs from spaces, so it will be a bit less crazy in the future. The dismantle tooltip now only says "Dismantle" when there are no wares returned. I have tried out some alternatives and I think that looks best. -- https://code.lau

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

2018-11-23 Thread Arty
Review: Approve Looks good now. The comment with the assciativity is kinda obsolete now though. And using int64_t wasn't really necessary now that you use the weights linearly. -- https://code.launchpad.net/~widelands-dev/widelands/terrain_affinity_as_int/+merge/358299 Your team Widelands Devel

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1802629-territorial-crash into lp:widelands

2018-11-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4267. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/458731325. Appveyor build 4061. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_180262

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove-anti-congestion-algorithm into lp:widelands

2018-11-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/remove-anti-congestion-algorithm into lp:widelands. Commit message: Remove the anti-congestion algorithm introduced in r8775 because it has too many bugs in it. Requested reviews: Widelands Developers (widelands-dev) Related bugs: B

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

2018-11-23 Thread hessenfarmer
Review: Approve test Agreed. now it looks consistent with the rest of the window. Thanks for fixing. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/empire04_unused_key_return_on_dismantle/+merge/358273 Your team Widelands Developers is subscribed to branch lp:~widelands-

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

2018-11-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/empire04_unused_key_return_on_dismantle into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/empire04_unused_key_return_on_dismantle/+merge/358273 -- Y

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

2018-11-23 Thread Benedikt Straub
The proposal to merge lp:~widelands-dev/widelands/ferry into lp:widelands has been updated. Description changed to: This is a feature for post-build20 of course, but it´s ready for (review and) testing now. It´ll need very extensive testing anyway due to the great economy engine changes. Ferr

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

2018-11-23 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/django_staticfiles into lp:widelands-website. Commit message: Implement django's default behavior for static files (css, js, images) Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1758515 in Widel

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

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

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove-anti-congestion-algorithm into lp:widelands

2018-11-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4272. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/458903460. Appveyor build 4066. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_remove_an

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

2018-11-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 4277. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/458960300. Appveyor build 4071. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4071

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1798297-locale-C into lp:widelands

2018-11-23 Thread GunChleoc
Transient failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1798297-locale-C/+merge/358364 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1798297-locale-C into lp:widelands. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-skip-translations-in-debug-builds into lp:widelands

2018-11-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/travis-skip-translations-in-debug-builds into lp:widelands. Commit message: On Travis, build translations and documentation only on release builds in order to help with job execution time. Requested reviews: Widelands Developers (wid

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1796364-blinking-buildings into lp:widelands

2018-11-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1796364-blinking-buildings into lp:widelands. Commit message: Remove z-layering fix for building texts introduced in r8847 because it is buggy and can make building animations disappear Requested reviews: Widelands Developers (wid