Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands

2019-05-11 Thread GunChleoc
Review: Approve I have pushed a commit with i18n fixes. Please merge this branch if you agree with them. I replaced "x / y soldiers" with "x soldiers", because the total is already on the button next to the slider, and we don't need the information twice. -- https://code.launchpad.net/~widelan

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands

2019-05-11 Thread Benedikt Straub
Thanks for the fixes :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/choose-attack-soldiers. ___ Mailing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands

2019-05-11 Thread Toni Förster
src/wui/attack_box.cc:109:75: warning: unused parameter 'max_attackers' [-Wunused-parameter] static inline std::string slider_heading(uint32_t num_attackers, uint32_t max_attackers) -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands De

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands

2019-05-11 Thread GunChleoc
Oops. I have cleaned this up now. -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/choose-attack-soldiers. ___ Mailing list: h

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Toni Förster
Very good so far, two nits though. Stockpile and Efficiency Profiles should be changeable but not deletable. Also, when deleting the active profile it should switch back to default. Otherwise, the deleted one is still shown as active and the drop-down list has an empty entry. -- https://code.

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

2019-05-11 Thread GunChleoc
Thanks, I can reproduce this. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. __

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

2019-05-11 Thread Toni Förster
I know this has been merged already, but I get a compile warning since this is in trunk. src/graphic/text/rt_render.cc:978:14: warning: implicit conversion increases floating-point precision: 'float' to 'const double' [-Wdouble-promotion] scale_(1.0f), -- https://code.launchpad.ne

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

2019-05-11 Thread Toni Förster
I get 2 compile warnings: src/graphic/text/rt_render.cc:63:6: warning: no previous prototype for function 'replace_entities' [-Wmissing-prototypes] void replace_entities(std::string* text) { src/wui/building_statistics_menu.cc:41:15: warning: unused variable 'kTabHeight' [-Wunused-const-variab

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Toni Förster
BTW while we're on it. Should we consider presetting all Profiles with sane values? -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Benedikt Straub
> Stockpile and Efficiency Profiles should be changeable but not deletable Okay, I´ll add a "undeletable" tag to these profiles > when deleting the active profile it should switch back to default. Otherwise, > the deleted one is still shown as active I thought we had agreed to not show "Default"

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/localization-post-build20 into lp:widelands

2019-05-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/localization-post-build20 into lp:widelands. Commit message: Backlog of localization updates Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/localizati

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/localization-post-build20 into lp:widelands

2019-05-11 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/localization-post-build20 into lp:widelands has been updated. Commit message changed to: Backlog of localization updates - Add localized versions to the basic SDL error messages. We will show the unlocalized version along with it due to lack of

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands

2019-05-11 Thread Toni Förster
What about r9105? Active button and the user is only bothered when he/she wants to host a game. :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/b

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

2019-05-11 Thread Benedikt Straub
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/productionsite-bugs into lp:widelands. Commit message: – Switch building to unoccupied animation when worker is removed – Allow basic tasks like carrying out superfluous wares even if not all workers are present yet Requested revi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands

2019-05-11 Thread Toni Förster
@kaputtnik I addressed your comments. The only thing I can't do ATM is, greying out the password field. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box/+merge/367100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-18

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Benedikt Straub
The predefined profiles are now undeletable. But I can´t reproduce this: > Otherwise, the deleted one is still shown as active and the drop-down list > has an empty entry. It works fine for me: When deleting the active profile, the dropdown immediately switches to "". -- https://code.launchpa

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands

2019-05-11 Thread Toni Förster
But I'm not confident whether we should grey the password field out as well. I would look too similar to an active edit box. Greying out the text "Password" and making the input box not editable should be sufficient, IMHO. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metase

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Toni Förster
Have a look at the picture. I deleted the profile test. https://fosuta.org/pics/empty_profile.png -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profile

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Benedikt Straub
I still can´t reproduce, it works fine for me: https://launchpadlibrarian.net/423268219/wl-economy-profiles.png (screenshot taken directly after I deleted the profile "Zero") -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Develope

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Toni Förster
Maybe I just failed to explain it. Have a look at the video. https://fosuta.org/pics/profile.mov -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread Benedikt Straub
Either I´m blind or I don´t see what I am doing wrong… https://bugs.launchpad.net/widelands/+bug/1827696/+attachment/5263113/+files/vokoscreen-2019-05-11_16-27-25.mkv -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subs

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

2019-05-11 Thread Toni Förster
Review: Needs Fixing Changing animations works. But the linked bug #1643170. I tested with a wood hardener. Working slot is shown as vacant and no lumberjack is available, but the wood hardener is filled with wares. -- https://code.launchpad.net/~widelands-dev/widelands/productionsite-bugs/+mer

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

2019-05-11 Thread Toni Förster
I think I need to explain better, sorry. The changing animations are working, also a building gets emptied when only one worker is available (tested with the enhanced brewery). But a building that has all worker slot vacant gets filled with wares. Since no worker will enter the building the ware

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

2019-05-11 Thread Toni Förster
Hmm. The problem I see is that usually no reminder/notification or any other indicator is present when a building has been constructed. So you might end up with a stocked building before you're even able to set it to 0. -- https://code.launchpad.net/~widelands-dev/widelands/productionsite-bugs/+

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

2019-05-11 Thread Benedikt Straub
The bug is only about wares not being carried out if some slots are still vacant although one is occupied. I consider the behaviour which you mean desired: Most of the time, you want to start transporting wares to the building at once (you don´t usually build buildings if you expect them to rema

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

2019-05-11 Thread Benedikt Straub
I usually keep the construction window open in a corner of the screen if I want to decrease wares directly after completion. We have an open wishlist bug about setting the settings for the later building in the constructionsite window, that will fix this. -- https://code.launchpad.net/~wideland

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

2019-05-11 Thread Toni Förster
Review: Approve Okay, it was just because the bug report I referred to, was explicitly mentioning what I described. But If this will be taken care in another branch then I'll have no reason for complaining :D -- https://code.launchpad.net/~widelands-dev/widelands/productionsite-bugs/+merge/3673

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

2019-05-11 Thread Benedikt Straub
Since it´s related to this feature, I´ll take care of bug 1597310 soon then :) -- https://code.launchpad.net/~widelands-dev/widelands/productionsite-bugs/+merge/367306 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/productionsite-bugs.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names into lp:widelands

2019-05-11 Thread Toni Förster
This is no good we need to remove commit 9102 & 9100 from trunk. This wasn't supposed to go in because it depended on two other branches. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names/+merge/367123 Your team Widelands Developers is subscribed to branch lp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands

2019-05-11 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 -- Your team Widelands Developers is su

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names into lp:widelands

2019-05-11 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1797702-spaces-in-names into lp:widelands has been updated. Status: Merged => Needs review For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names/+merge/367123 -- Your team Widelands Develo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names into lp:widelands

2019-05-11 Thread Toni Förster
I reverted it. Trunk should be clean now. This branch can go in as soon as the open-games and metaserver-login branches are merged. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names/+merge/367123 Your team Widelands Developers is subscribed to branch lp:~wideland

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/localization-post-build20 into lp:widelands

2019-05-11 Thread hessenfarmer
I think we should link the open bugs for these changes to the branch. There are other open bugs regarding the e.g the frisians which could be fixed as well. I will link all relevant bugs. If they should be fixed seperatly feel free to remove them again. -- https://code.launchpad.net/~widelands-

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

2019-05-11 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/AI-fixes into lp:widelands. Commit message: !!Important!! !!fri03 scenario needs to be removed from this branch before merging!! !!it was only added for testing!! This fixes improves some behavior in AI performance Ai is now able to

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

2019-05-11 Thread hessenfarmer
The proposal to merge lp:~widelands-dev/widelands/AI-fixes into lp:widelands has been updated. Description changed to: Following things changed: 1. barbarian barracks no longer part of basic economy 2. AI expands to low guarded enemy territory 3. AI builds more economy buildings based on neededn

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

2019-05-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 4936. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531118419. Appveyor build 4717. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_production

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands has been updated. Status: Work in progress => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/3673

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/36

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands with lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start as a prerequisite. Commit message: rework netsetup - allowed characters are limited - login wit

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
This replaces the old merge request, I broke: https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 This is the first patch of 3. This needs to go in before the others can be merged. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start into lp:widelands. Commit message: only display games for the same version and when they are open * The list in the lobby has been renamed to "Open Games" * only games a user can join will be listed

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands

2019-05-11 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 -- Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands

2019-05-11 Thread Toni Förster
This one got replaced by this one here: https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games-clean-start/+merge/367311 It contains all changes up to r9105. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 Your team Widelands Develo

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands with lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start as a prerequisite. Commit message: redesigned login box - limit the possible characters for username

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
This one replaces the old one I messed up: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box/+merge/367100 This is the second out of 3 patches. This can go in as soon as this branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start has been merged

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands

2019-05-11 Thread Toni Förster
This one gets replaced by the following one: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367312 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box/+merge/367100 Your team Widelands Developers is sub

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands has been updated. Status: Work in progress => Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands

2019-05-11 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box/+merge/367100 -- Your team Wid

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
Review: Approve This is the same as this one: https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names/+merge/367123 The old one got approved but was merged too early. This is the third patch that needs to go in when the others have been merged -- https://code.launchpad.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands

2019-05-11 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314 --

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/localization-post-build20 into lp:widelands

2019-05-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 4937. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531119384. Appveyor build 4718. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_localizati

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-05-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 4940. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531134022. Appveyor build 4721. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_economy_ta

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

2019-05-11 Thread bunnybot
Continuous integration builds have changed state: Travis build 4941. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/531134851. Appveyor build 4722. 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/AI-fixes into lp:widelands

2019-05-11 Thread TiborB
Review: Approve >From AI code point of view - The changes can be OK, it is hard to say just >looking at the code. I presume that you made sure the magic numbers does not >repeat - dont forget they are used also in other AI files... I will do some training once it is approved and merged. I did no