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

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

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

2019-05-08 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands has been updated. Commit message changed to: redesigned login box - limit the possible characters for usernames - draw a red box around the input field for erroneous input - tell user were to r

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

2019-05-08 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1797702-spaces-in-names into lp:widelands. Commit message: rework netsetup - allowed characters are limited - login with empty username not allowed - if username ist taken append number - don't join game with empty use

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

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

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

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

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

2019-05-08 Thread Toni Förster
Your're right. Chnaged it. -- 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-1825932-open-games. ___ Mailing list

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

2019-05-09 Thread Toni Förster
Neither on the forum nor the metaserver are spaces allowed. Since the nickname is shared across online gaming and LAN gaming, we need to apply the same naming rules. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names/+merge/367123 Your team Widelands Developers i

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

2019-05-09 Thread Toni Förster
I'm going to fix the string. Thank you for the explanation. As for your concerns, I think I have solution. We check only for changes in the editbox and when clicking the host game button. So when you enter the lobby, you won't be bothered with the red box. -- https://code.launchpad.net/~wide

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

2019-05-09 Thread Toni Förster
Will address the strings later. For the others see the diff comments. Diff comments: > === modified file 'src/ui_fsmenu/multiplayer.cc' > --- src/ui_fsmenu/multiplayer.cc 2019-02-23 11:00:49 + > +++ src/ui_fsmenu/multiplayer.cc 2019-05-08 19:59:17 + > @@ -58,21 +58,46 @@ >

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

2019-05-09 Thread Toni Förster
Addressed your concerns regarding the red border. I also fixed a crash. Would you have a look at the diff comment, please? Diff comments: > > === modified file 'src/ui_fsmenu/internet_lobby.cc' > --- src/ui_fsmenu/internet_lobby.cc 2019-05-05 00:22:27 + > +++ src/ui_fsmenu/internet_lobby.

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

2019-05-09 Thread Toni Förster
Review: Needs Fixing One major problem. Pressing the save button pauses the game without actually showing, that the game is paused. That might tolerable in single player, but in multiplayer it pauses the game for all participants. This should not happen. Also get this warning during compiling:

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

2019-05-09 Thread Toni Förster
Figured it is worse. The game stalls, it is not paused. The game stalls as long as the save window is open, when closing the windows it fast forwards the time. e.g. Opening the window at 1.30 and leaving it open for 1 minute, means after closing it, the time will fast-forward to 2.30. -- https:

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

2019-05-09 Thread Toni Förster
Did you remove the changes from this branch? https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developers is requested to review the proposed merge of lp:~widel

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

2019-05-09 Thread Toni Förster
This doesn't work for me any more in the latest trunk... -- 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/soldier-capacity-ctrl into lp:widelands

2019-05-09 Thread Toni Förster
Forget, my last comment I was just confused. Sorry. -- 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/choose-attack-soldiers into lp:widelands

2019-05-09 Thread Toni Förster
Sorry my mistake. But I do have a request. Could you add the CTRL-key behaviour to set the soldiers to max or minimum? This is the only window left where this isn't possible. -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developer

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

2019-05-09 Thread Toni Förster
Tested 9101 and it works perfect. Just one more thing. There are only 8 Soldiers shown per row. Which means there is a huge space below the "Start Attack" button. Is it somehow possible to use this space as well and show 9 soldiers per row? -- https://code.launchpad.net/~widelands-dev/widelands

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

2019-05-10 Thread Toni Förster
> How about removing the slider and replacing it with some buttons next to the > lists? I hate fiddling with my mouse to position it over that tiny thing. Why not just make the slider bigger? -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Wi

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

2019-05-10 Thread Toni Förster
Some changes I'd like to propose. Do we need the word "soldiers" left to the slider? Shouldn't this be obvious? We could get more space by removing text. Secondly make the slider buttons as big as the attack button. Here is how it could look like: https://fosuta.org/pics/attack.png I can attach

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

2019-05-10 Thread Toni Förster
Here is another idea: https://fosuta.org/pics/attack1.png -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands.

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

2019-05-10 Thread Toni Förster
Sorry for spamming, but I think this would be the ideal solution, IMHO. https://fosuta.org/pics/attack2.png -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/wi

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

2019-05-10 Thread Toni Förster
> Un nu de Weddervörhersaag: Een bannig dichter Hagel vun Vörslagens ;) :D > How do you like the one I implemented now? Almost awesome. :) Some nits though: The tooltips for the lists hide the line were the soldier’s strength is shown. If you could change the values to the ones in the diff-c

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

2019-05-10 Thread Toni Förster
Oh I forgot, If you could make the slider 17 pix high instead of 20 it would look more elegant, IMHO. -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/wideland

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

2019-05-10 Thread Toni Förster
Sorry to bother you once more :( Could you make the slider 210px wide, please? Then we would have a maximum of 10 soldiers per row, which looks even better. :) Regarding the tooltip. Putting them in the text area where the soldier's info are shown is too intrusive, IMHO. Can text areas also hol

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

2019-05-10 Thread Toni Förster
Hmmm, what if we added them to the "Attackers" and "Not attacking" fields? Players would definitely hover over these areas. -- https://code.launchpad.net/~widelands-dev/widelands/choose-attack-soldiers/+merge/367041 Your team Widelands Developers is requested to review the proposed merge of lp:~

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

2019-05-10 Thread Toni Förster
Review: Approve Looks good -- 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: https:/

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

2019-05-10 Thread Toni Förster
a/this Diff comments: > > === modified file 'src/wui/attack_box.cc' > --- src/wui/attack_box.cc 2019-02-23 11:00:49 + > +++ src/wui/attack_box.cc 2019-05-10 18:57:04 + > @@ -128,48 +180,232 @@ > void AttackBox::init() { > assert(node_coordinates_); > > - uint32_t max

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/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/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/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

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/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 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/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 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/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/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

[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

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 jo

[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

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/bug-1825932-open-games into lp:widelands

2019-05-12 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands has been updated. Status: Rejected => Superseded 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-clean-start into lp:widelands

2019-05-12 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 jo

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

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

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

2019-05-12 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 as a prerequisite. Commit message: redesigned login box - limit the possible characters for usernames - draw a

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

2019-05-12 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merg

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

2019-05-12 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

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

2019-05-12 Thread Toni Förster
Sometimes it is better to go to bed and start over the next day :D I deleted the other merge request and linked the clean branches to the existing merge requests. @Gun I'm not sure whether a different colouring of the text would help. So I did the following. When a user enters the lobby, the "

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

2019-05-12 Thread Toni Förster
Works so far, but the overlapping areas are very hard to see. Could they be a little more saturated? -- https://code.launchpad.net/~widelands-dev/widelands/overlapping_workareas/+merge/366623 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/overlapping_workareas

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

2019-05-12 Thread Toni Förster
Some problems in the lobby and multiplayer chat: - The text in the input box is not centred (q,g, j and so on are cut off) - Private messages double the prefix - The @ in private message shouldn't be underlined - There should either be no space before the @ in private messages or an additional

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

2019-05-12 Thread Toni Förster
=== modified file 'src/wui/game_chat_panel.cc' --- src/wui/game_chat_panel.cc 2019-05-12 07:45:59 + +++ src/wui/game_chat_panel.cc 2019-05-12 13:12:29 + @@ -41,12 +41,12 @@ 0, 0, w, - h - 25, + h - 30, style,

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

2019-05-12 Thread Toni Förster
Well, then. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games-clean-start/+merge/367318 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start.

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

2019-05-12 Thread Toni Förster
Review: Approve Perfect. -- https://code.launchpad.net/~widelands-dev/widelands/overlapping_workareas/+merge/366623 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/overlapping_workareas. ___ Mailing list: https://lau

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands

2019-05-12 Thread Toni Förster
I got ~100 compile warnings: src/io/filesystem/filesystem.h:150:71: warning: unknown command tag name [-Wdocumentation-unknown-command] /// Returns all files in the given 'directory' that match 'basename[_\d{1,3}].extension'

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

2019-05-13 Thread Toni Förster
On more question. We have 2 different fonts now. The one used in editboxes is completely different from the other font. Is this intentionally? -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merg

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

2019-05-13 Thread Toni Förster
And one more. This is the handling of direct messages. I know this is branch is about fonts but maybe we can address this here. Do we need: sender @recepiant: text For direct messages? The name is already coloured green and the text italic. This differentiates the message more than enough from

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

2019-05-14 Thread Toni Förster
Please test again it should address all issues. The only problem is that the caret does not move properly. Help is appreciated. :) @Gun have a look at the diff comment, please. Diff comments: > > === modified file 'src/ui_fsmenu/multiplayer.cc' > --- src/ui_fsmenu/multiplayer.cc 2019-05-1

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

2019-05-14 Thread Toni Förster
Solved :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start. ___

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

2019-05-14 Thread Toni Förster
Diff comments: > > === modified file 'src/wui/economy_options_window.cc' > --- src/wui/economy_options_window.cc 2019-02-23 11:00:49 + > +++ src/wui/economy_options_window.cc 2019-05-11 13:37:58 + > @@ -186,35 +281,399 @@ > const Widelands::Economy::TargetQuantity

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

2019-05-14 Thread Toni Förster
Carets are also fixed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start.

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

2019-05-14 Thread Toni Förster
I made the "show login dialog" button a proper button. kaputtnik has second thoughts, though. here is a screenshot: https://i.ibb.co/b3W3x3W/internetgame.png -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Dev

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

2019-05-15 Thread Toni Förster
I could think of another option. We remove the button entirely. The login window is always shown for non registered users. When a user has entered a password, the dialog won't be shown as long as the password is valid. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserve

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

2019-05-15 Thread Toni Förster
Still shows "Not Selected" instead of an empty entry. -- 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/font_size-lua into lp:widelands

2019-05-15 Thread Toni Förster
In trunk admins are written in green in the client list. Did you remove this on purpose? If not, I'm going to post the patch the next comment, -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed me

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

2019-05-15 Thread Toni Förster
=== modified file 'src/ui_fsmenu/internet_lobby.cc' --- src/ui_fsmenu/internet_lobby.cc 2019-05-13 06:04:34 + +++ src/ui_fsmenu/internet_lobby.cc 2019-05-15 08:36:30 + @@ -296,6 +296,8 @@ case kClientSuperuser: pic = g_gr->ima

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

2019-05-15 Thread Toni Förster
I get these compiler warnings a couple of times. /Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/building_settings.h:42:8: warning: 'Widelands::BuildingSettings' has virtual functions but non-virtual destructor [-Wnon-virtual-dtor] struct BuildingSettings {

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

2019-05-15 Thread Toni Förster
Some comments regarding the UI. I think we should keep the UI consistent. Instead of checkboxes please use the icons/buttons that are used in the building's window. The same applies for the priority settings. We use traffic lights instead of buttons. -- https://code.launchpad.net/~widelands-de

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

2019-05-15 Thread Toni Förster
I have moved username validation to internet gaming. I'm currently experimenting with a logout button stay tuned :=) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widela

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

2019-05-15 Thread Toni Förster
We have a logout button now :D The login dialog will be shown only for non registered users. Registered users may log out from their account from within the lobby. The additional login button from the Multiplayer menu is removed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-182778

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

2019-05-15 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands has been updated. Commit message changed to: redesigned login box - limit the possible characters for usernames - draw a red box around the input field for erroneous input - tell us

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

2019-05-15 Thread Toni Förster
hmm. I would prefer icons but you are completely right. I opened a topic in the forum: https://wl.widelands.org/forum/topic/4518/?page=1#post-27957 -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review

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

2019-05-15 Thread Toni Förster
Four warnings left: src/logic/playercommand.cc:2288:6: warning: default label in switch which covers all enumeration values [-Wcovered-switch-default] default: src/logic/playercommand.cc:2384:6: warning: default label in switch which covers all enumeratio

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

2019-05-15 Thread Toni Förster
Your buttons are a little too big. The buttons for in-/decreasing the wares are 24x24 while yours are 25x30. Also, some wares are covered by the button; see the fish in the tavern (I guess that is because of your buttons being to big) -- https://code.launchpad.net/~widelands-dev/widelands/const

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

2019-05-15 Thread Toni Förster
With this branch I get crashes after a while. Not sure if the culprit is this branch or something in trunk, though. /Users/toni/Launchpad/widelands-repo/working_tree/src/graphic/animation.cc:451] Requested unknown animation with id: -432781024 ==54196==ERROR: AddressSanitizer: SEGV on unknown ad

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

2019-05-15 Thread Toni Förster
Well another solution would be: We rename the back button to "Leave lobby" Above the button we have a checkbox "Clear login data" -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branc

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

2019-05-15 Thread Toni Förster
Assertion failed: (military_site_->capacity_ != capacity), function set_soldier_capacity, file /Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/militarysite.cc, line 85. -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428

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

2019-05-16 Thread Toni Förster
Hmm, I'm still uncertain. What about this? https://fosuta.org/pics/multi-settings.png I have to flesh out the details, though. Bu would this Screen look okay? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Dev

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

2019-05-16 Thread Toni Förster
The proposal to merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands has been updated. Commit message changed to: redesigned login box - limit the possible characters for usernames - draw a red box around the input field for erroneous input - tell us

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

2019-05-16 Thread Toni Förster
I gave it another run. The button is now called “Login settings” and sits in between the “LAN / Direct IP” ans “Back”.[1] The Title of the Login box has be renamed accordingly, also the “Login” button has been renamed to “Save”.[2] The window opens automatically when no username or an invalid u

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

2019-05-16 Thread Toni Förster
+1 -- https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation/+merge/352844 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing list: https://launchpad.net/~widelands-dev Pos

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

2019-05-16 Thread Toni Förster
crash: NOCOM: EconomyOptionsWindow::update_profiles_select(Default) Planning to select »Default« Did not select it because it is already selected NOCOM: EconomyOptionsWindow::update_profiles, applicable »« Desired and actual state of the empty »« profile don´t match NOCOM: Eco

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

2019-05-16 Thread Toni Förster
And another assertion. Assertion failed: (animation_index < animations.size()), function draw, file /Users/toni/Launchpad/widelands-repo/working_tree/src/logic/map_objects/tribes/constructionsite.cc, line 85. -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge

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

2019-05-16 Thread Toni Förster
r9110 fixed it. Thanks allot. -- 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. ___ Mailing list: ht

<    1   2   3   4   5   >