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

2019-05-12 Thread GunChleoc
Found the bug and fixed the compiler warnings :) -- 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/localization-post-build20 into lp:widelands

2019-05-12 Thread GunChleoc
Thanks for collecting them - let's fix them all in this branch. -- https://code.launchpad.net/~widelands-dev/widelands/localization-post-build20/+merge/367305 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/localization-post-build20 into lp:

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

2019-05-12 Thread GunChleoc
In your video, I don't see you accessing the dropdown in the economy window after the deletion. -- 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-12 Thread GunChleoc
1 nit for the saveloading, not tested yet. We should also remember to add TODO comments when adding savegame compatibility code - this will make it easier to find and remove after Build 21. Diff comments: > > === modified file 'src/map_io/map_buildingdata_packet.cc' > --- src/map_io/map_buildi

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

2019-05-12 Thread GunChleoc
Found a typo in a comment. The Lua code does not need reviewing because it will be removed anyway, but we should do a bit of testing. Diff comments: > > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2019-04-20 05:44:37 + > +++ src/ai/defaultai.cc 2019-05-11

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

2019-05-12 Thread GunChleoc
I just noticed this in the font_size-lua branch too and have fixed it there. -- https://code.launchpad.net/~widelands-dev/widelands/representative_image_in_font_renderer/+merge/363781 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/representative_image_in_font_r

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

2019-05-12 Thread GunChleoc
Review: Needs Fixing This does not quite work yet. 1. Build a Wood Hardener 2. Wait until it is full 3. Set input queue to 0 logs 4. Evict the worker When the worker returns, he won't remove the wares from the building -- https://code.launchpad.net/~widelands-dev/widelands/productionsite-bugs/+

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

2019-05-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 4943. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531220205. Appveyor build 4724. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_179770

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

2019-05-12 Thread bunnybot
Error merging this proposal: Output: stdout: stderr: Committing to: /mnt/bunnybot_data/bunnybot_data/data/bzr_repo/_widelands_dev_widelands_trunk/ bzr: ERROR: No changes to commit. Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit. -- https://code.lau

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

2019-05-12 Thread GunChleoc
I gave up on the scenario after connecting 20 farms or so. Multiplayer game ran fine for > 7 hours gametime. So, this can go in once the branch has been cleaned up :) -- https://code.launchpad.net/~widelands-dev/widelands/AI-fixes/+merge/367309 Your team Widelands Developers is subscribed to bra

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

2019-05-12 Thread Benedikt Straub
Bug fixed Diff comments: > > === modified file 'src/map_io/map_buildingdata_packet.cc' > --- src/map_io/map_buildingdata_packet.cc 2019-04-09 17:16:11 + > +++ src/map_io/map_buildingdata_packet.cc 2019-05-11 12:50:41 + > @@ -710,6 +710,12 @@ > produc

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

2019-05-12 Thread GunChleoc
Review: Approve Confirmed. Dome more testing and is working fine :) @bunnybot merge -- 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. _

[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 join will be listed

[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 re

[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 username

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

2019-05-12 Thread GunChleoc
Review: Approve Good solution, works for me :) I'll leave the merging to you so I won't mess it up again. -- 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/bu

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

2019-05-12 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands has been updated. Commit message changed to: Improve performance and memory usage when loading tribes and world - Save memory and loading time by not listing files via Lua - Common sequential file loading

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

2019-05-12 Thread GunChleoc
I have pushed a small tweak and added some more comments. Diff comments: > === modified file 'src/ui_fsmenu/multiplayer.cc' > --- src/ui_fsmenu/multiplayer.cc 2019-05-11 18:50:30 + > +++ src/ui_fsmenu/multiplayer.cc 2019-05-12 11:12:04 + > @@ -58,21 +58,46 @@ > vbox_.add_i

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

2019-05-12 Thread hessenfarmer
@Tibor: of course I made sure the numbers are not used elsewhere. Shall I add more comments to explain my changes? @GunChleoc: will fix the typo ofcourse. I never did any thing in the scenario but watching the AI's doing their job. If you do so you would see significant progress. And you can se

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/AI-fixes into lp:widelands

2019-05-12 Thread GunChleoc
I'll have a look. Also, I got this: ../src/ai/defaultai.cc: In member function ‘bool DefaultAI::check_productionsites(uint32_t)’: ../src/ai/defaultai.cc:4474:95: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] 1000 < gametime && site.site->can_start_w

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

2019-05-12 Thread GunChleoc
I think I found the problem: (bo.outputs.size() == 1) means that there is 1 entry at index 0. (tribe_->get_ware_descr(bo.outputs.at(1)) would only be available if bo.outputs.size() > 1 Unlike Lua, C++ starts counting from 0. Actually, Lua is quite exceptional here, since starting from 0 is the

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 Benedikt Straub
Updated the colours, are these better? -- 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

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/localization-post-build20 into lp:widelands

2019-05-12 Thread hessenfarmer
Just saw that there are 2 issues on transifex for the first frisian scenario which would fit in here as well. -- https://code.launchpad.net/~widelands-dev/widelands/localization-post-build20/+merge/367305 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-

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

2019-05-12 Thread GunChleoc
Review: Approve LGTM :) -- 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://laun

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/AI-fixes into lp:widelands

2019-05-12 Thread Benedikt Straub
Tested it now with the 3rd frisian scenario. The AI behaved quite well, just some nits: – It builds mainly blockhouses and small milsites. IMHO it should build preferably bigger milsites near the enemy´s border, even if it´s unguarded. – It´s still quite confused by the inability to build woodcut

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

2019-05-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 4946. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/531247546. Appveyor build 4727. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_AI_fixes-4

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

2019-05-12 Thread TiborB
@nordfriese about warehouses - they are in proportion to productionsites, I dont think AI can have any idea it needs more warehouses in this specific case... -- https://code.launchpad.net/~widelands-dev/widelands/AI-fixes/+merge/367309 Your team Widelands Developers is subscribed to branch lp:~

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

2019-05-12 Thread TiborB
@hessenfarmer "@Tibor: of course I made sure the numbers are not used elsewhere. Shall I add more comments to explain my changes?" No, I am fine, I also believe that AI training will settle down these changes. I intend to run 100 iterations as soon as the branch is in trunk.. -- https://code.la

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

2019-05-12 Thread GunChleoc
Done. I have also changed the descnames for the resource indicators. Resource indicators, fields, rocks and trees now have tooltips. Do we want them for all of these? -- https://code.launchpad.net/~widelands-dev/widelands/localization-post-build20/+merge/367305 Your team Widelands Developers is

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

2019-05-12 Thread GunChleoc
Eek. Should be fixed now. -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. __

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

2019-05-12 Thread GunChleoc
> The point of this objective is force the player to be almost idle until the > enemy is standing right at his gates. And to force him to create a good road > network under this pressure, which can be very important for the battles > later. I get what you're trying to do, but hooking up all

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

2019-05-12 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/show_user_posts into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/show_user_posts/+merge/367237 -- Your team Widelands Develo

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

2019-05-12 Thread hessenfarmer
Code looks good so far. one nit in a diff. will download compile and test now. Diff comments: > > === modified file 'data/tribes/wares/fire_tongs/helptexts.lua' > --- data/tribes/wares/fire_tongs/helptexts.lua2017-07-07 16:51:39 > + > +++ data/tribes/wares/fire_tongs/helptexts.lua

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

2019-05-12 Thread hessenfarmer
Sorry found another bug which fits in here. Can be solved in seperate branch though. -- https://code.launchpad.net/~widelands-dev/widelands/localization-post-build20/+merge/367305 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/localization

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

2019-05-12 Thread hessenfarmer
@ Nordfriese: fixed the codecheck warnings. We should try to forbid useless buildings like the tavern and see what's the effect. Regarding warehouses the problem was not the number but the distribution. as the script delivers only to one warehouse a time, this is putting the road network under s

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

2019-05-12 Thread hessenfarmer
@ Nordfriese: If you want to test this further let us know, if you are finished we could merge this. -- https://code.launchpad.net/~widelands-dev/widelands/AI-fixes/+merge/367309 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/AI-fixes. ___

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

2019-05-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 4948. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531272166. Appveyor build 4729. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_179770

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

2019-05-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 4950. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531272518. Appveyor build 4731. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_182593

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

2019-05-12 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games-clean-start/+merge/367318 -- Your team W

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

2019-05-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 4951. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/531329354. Appveyor build 4732. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_per_level_s

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

2019-05-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 4953. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/531353166. Appveyor build 4734. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_