Re: [Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands

2016-01-28 Thread GunChleoc
Code LGTM - just 1 nit: get_y_fropreceding_ => get_y_from_preceding. I have marked 2 instances with diff comments. Diff comments: > > === modified file 'src/ui_fsmenu/campaign_select.cc' > --- src/ui_fsmenu/campaign_select.cc 2015-10-23 18:03:33 + > +++ src/ui_fsmenu/campaign_select.cc 20

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

2016-01-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/ui_align into lp:widelands. Commit message: UI::Align is now an enum class. Got rid of align aliases in UI::Box. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1367725 in widelands: "Consistent nami

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

2016-01-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1530124 into lp:widelands. Commit message: - Fixed crash with richtext font renderer for filenames that contain in Table, MultilineTextarea and EditBox. - EditBox now uses the new font renderer. - Fixed a crash in SpinBox

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

2016-01-28 Thread GunChleoc
We have updated Together We're Strong because of the artifacts, so you will need to grab the map from Build 18. I actually want to take a different approach to this: Rather than putting the compatibility code back in, only load needed packages in the editor. So, this branch is now only sitting

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

2016-01-29 Thread GunChleoc
The . has to stay for Linux. Otherwise, Widelands would assume an absolute path and would look for /data/ instead of /data/. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-139

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

2016-01-29 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_packet_loading into lp:widelands. Commit message: Map compatibility: - No longer saving or loading unneeded packages in the editor. - Removed compatibility code from MapBuildingPacket. Requested reviews: Widelands Developers

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

2016-01-29 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/map_compatibility into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088 -- Your team Widelands Developers is subscribed

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

2016-01-29 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/map_packet_loading into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/map_packet_loading/+merge/284470 -- Your team Widelands Developers is

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

2016-01-29 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_packet_loading into lp:widelands. Commit message: Map compatibility: - No longer saving or loading unneeded packages in the editor. - Removed compatibility code from MapBuildingPacket. Requested reviews: Widelands Developers

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

2016-01-29 Thread GunChleoc
Now I get what you mean - fixed :) @Tino: does this help with Windows? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___

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

2016-01-29 Thread GunChleoc
Thanks for testing! Yes, the naming is based on the source code, fs = fullscreen in this case. If we rename anything here, it should be done both in the source code and the images - naming should be identical. how about: ui_sfmenu -> ui_menu wui -> ui_game? -- https://code.launchpad.net/~wide

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

2016-01-29 Thread GunChleoc
About the nits: richtext.cc is moribund, so I don't want to make any code changes to accommodate it that I will need to undo later. Does that make sense? I haven't tested the behaviour in the renderers carefully, but I expect a word node won't be broken up into multiple lines - otherwise, there

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

2016-01-30 Thread GunChleoc
Added some comments. IMO the best way to solve the tabs issue is to run clang-format over the whole codebase and remove the conflicting codecheck rules. I just tend not to run clang-format ATM, because it makes the diff big. Diff comments: > > === modified file 'src/graphic/text_layout.cc' >

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

2016-01-30 Thread GunChleoc
+1 for finetuning the file structure later. I have added SirVer's idea to the bug. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___

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

2016-01-30 Thread GunChleoc
I got an error running the Appveyor build - see screenshot: https://bugs.launchpad.net/widelands/+bug/1531114/comments/4 1 tiny code style consistency nit. Diff comments: > > === modified file 'src/wui/plot_area.cc' > --- src/wui/plot_area.cc 2016-01-28 21:27:04 + > +++ src/wui/plot_a

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

2016-01-30 Thread GunChleoc
I am getting another crash. To reproduce, start a new game and click on general statistics. ComputerPlayer(2): initializing (2) Forcing flag at (43, 59) Message: adding (wh) (warehouse) 1 Forcing flag at (42, 21) Message: adding (wh) (warehouse) 2 Font file not found. Falling back to serif: con

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

2016-01-31 Thread GunChleoc
Review: Approve code I find update annoying and difficult too, so I'm all for it. I expect that the added CPU load won't increase for long games, so I think we can afford the extra CPU time - the recent graphics changes have already saved a lot, so we'll still be better off than we were before

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

2016-01-31 Thread GunChleoc
No crashes now, but another bug in the general stats - looks like the assert wasn't that silly, maybe? https://launchpadlibrarian.net/235815511/stats_lines.png -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested

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

2016-01-31 Thread GunChleoc
I am already working on fixing up the codecheck rules so we can run clang-format, because it is annoying me too. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530124/+merge/284356 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bu

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

2016-01-31 Thread GunChleoc
I just tried the latest Appveyor build and datadir is still broken for Windows. I have pushed a change that will hopefully fix it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/b

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

2016-01-31 Thread GunChleoc
Review: Approve testing I have tested this now - everything seems ok. -- https://code.launchpad.net/~widelands-dev/widelands/remove_update/+merge/284524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_update.

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

2016-01-31 Thread GunChleoc
I have pulled the functions out. The for loop has to stay as it is, because I am referencing iterator.end(). -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525680. _

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

2016-01-31 Thread GunChleoc
All I have to do is start a game, open the statistics window and wait. As soon as a line gets plotted, it gets a diagonal downwards left added to the end node. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested

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

2016-01-31 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_plateau_textdomain into lp:widelands. Commit message: Fixed Textdomain for The Green Plateau. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1397500 into lp:widelands. Commit message: Moved GL shaders into external files. Fragment shaders now live in "data/shaders/.fp" and vertex shaders in "data/shaders/.vp". Requested reviews: Widelands Devel

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/clang-codecheck into lp:widelands. Commit message: Prepared the codecheck rules and source code to be compatible with clang-format. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/obsolete_format_macro into lp:widelands. Commit message: Cleaned up switch statement in Building::info_string: Replaced FORMAT macro with enum class and got rid of unused cases. Requested reviews: Widelands Developers (widelands-dev

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

2016-02-01 Thread GunChleoc
Thanks, Tibor! All fixed now :) -- https://code.launchpad.net/~widelands-dev/widelands/clang-codecheck/+merge/284586 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/clang-codecheck into lp:widelands.

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/tags_again into lp:widelands. Commit message: Added a test for the text renderer to make sure that does not crash. This test checks Tables, Listselect and MultilineTextarea. Requested reviews: Widelands Developers (widelands-dev

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1535065 into lp:widelands. Commit message: Unset player starting position in MapGenerator if coordinates are illegal. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1535065 in widelands: "E

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/compiler_warning into lp:widelands. Commit message: Fixed compiler warning and updated comment in game_renderer.cc. Requested reviews: SirVer (sirver) For more details, see: https://code.launchpad.net/~widelands-dev/widelands

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

2016-02-01 Thread GunChleoc
I agree that this still needs more fixing - right now, I just want to get rid of the crash. I tried fiddling wit it a bit, but as soon as I try to get the FCoords from the Coords, the player positions get messed up, and I have no idea why yet. So, I am for merging this and leaving the bug open.

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

2016-02-01 Thread GunChleoc
This will be a problem caused by r7764 and it is not related to this branch. Could you please open a bug report and also say which of the tests is failing for you? -- https://code.launchpad.net/~widelands-dev/widelands/tags_again/+merge/284636 Your team Widelands Developers is requested to revie

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

2016-02-01 Thread GunChleoc
I think I found them - pushed a fix to trunk. Please let me know if this fixes trunk. -- https://code.launchpad.net/~widelands-dev/widelands/tags_again/+merge/284636 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tags_again into lp:widelan

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

2016-02-01 Thread GunChleoc
Review: Approve Code LGTM :) This can be merged as soon as Travis passes. -- https://code.launchpad.net/~widelands-dev/widelands/ai_parameters_tweak/+merge/284667 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_parameters_tweak. ___

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

2016-02-02 Thread GunChleoc
Bug reports created - I didn't get the crash in Smugglers again, but it should be tested just in case. -- https://code.launchpad.net/~widelands-dev/widelands/map_packet_loading/+merge/284470 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_packet_loading. _

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

2016-02-02 Thread GunChleoc
Fixing the nit is beyond my abilities - it will fail on Type*&. Both the types and the operators are correctly formatted by my clang-format, I have tested this. Diff comments: > > === removed file 'cmake/codecheck/rules/missing_padding' > --- cmake/codecheck/rules/missing_padding 2014-07-1

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

2016-02-02 Thread GunChleoc
My bug is now gone :) Give me a shout here when you want me to look at the code again. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/beautiful_co

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

2016-02-02 Thread GunChleoc
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ignore_dev_branch/+merge/284711 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ignore_dev_branch. ___ Mailing list: htt

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

2016-02-02 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1532279 into lp:widelands. Commit message: ScrollMode in MultilineTextarea is now an enum class, and it is now set through the constructor only. Added new enum member "kNoScrolling", which will expand the MultilineTexta

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

2016-02-02 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/remove_deprecated into lp:widelands. Commit message: Removed unused option "setdescription" from worker program. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~wid

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

2016-02-02 Thread GunChleoc
The healthbar issue in the screenshot looks like an overlap - make the bar 1-2 pixels thinner and it should fit. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-

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

2016-02-02 Thread GunChleoc
I just had a loser look, the Rectangle program needs to draw the upper line a bit lower, that should fix it. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/

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

2016-02-03 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535065/+merge/284658 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1535065. ___ Mailing list: https://launchpad.net/~widelands-dev Post

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

2016-02-03 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/remove_deprecated/+merge/284729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_deprecated. ___ Mailing list: https://launchpad.ne

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

2016-02-03 Thread GunChleoc
@Tibor: Can you give me a backtrace, or a filename that is causing the issue? The problem should be fixed now, but there might be some special characters causing problems - I want to allow localized file names. so simply restricting to alphanumeric won't work. @bunnybot merge -- https://code.

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

2016-02-03 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/obsolete_format_macro/+merge/284590 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/obsolete_format_macro. ___ Mailing list: https://launchpad.net

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

2016-02-03 Thread GunChleoc
Travis has passed. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_parameters_tweak/+merge/284667 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_parameters_tweak. ___ Mailing list: https

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

2016-02-03 Thread GunChleoc
I can't reproduce that, so it must be a problem that's triggered on your system specifically. It's not caused by this branch. Maybe go back a few revisions on trunk to find the commit that causes the problem? -- https://code.launchpad.net/~widelands-dev/widelands/tags_again/+merge/284636 Your te

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

2016-02-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/messagebox into lp:widelands. Commit message: Refactored WLMessageBox. It now no longer depends on the old font renderer, and scrollbars only appear when they are needed. Requested reviews: Widelands Developers (widelands-dev) For

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

2016-02-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1541697 into lp:widelands. Commit message: Fixed datadir_for_testing in regression_test.py. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1541697 in widelands: "regression_test.py does not wo

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

2016-02-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Some consistency fixes: - Consistent naming of loader_ui variables. - More consistent Progresswindow strings. - Consistent use of colons with spinboxes in the Options menu. Requested

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

2016-02-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/pretty-datadirs into lp:widelands. Commit message: Canonicalized datadir and datadir_for_testing in WLApplication. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands

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

2016-02-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_ware_amount into lp:widelands. Commit message: Changed amount in WareAmount from uint8_t to uint32_t. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev

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

2016-02-05 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/messagebox/+merge/285023 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/messagebox. ___ Mailing list: https://launchpad.net/~widelands-dev Post t

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

2016-02-05 Thread GunChleoc
Diff comments: > === modified file 'src/logic/map_objects/tribes/bill_of_materials.h' > --- src/logic/map_objects/tribes/bill_of_materials.h 2015-12-11 19:06:50 > + > +++ src/logic/map_objects/tribes/bill_of_materials.h 2016-02-04 17:53:17 > + > @@ -25,7 +25,7 @@ > #include "logic/w

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

2016-02-05 Thread GunChleoc
Please don't jump off a bridge now, but I get some fuzzy lines now - the culprit seems to be interpolation of the edges with horizontal/vertical lines (0°, 90°, 180° and 270°). https://launchpadlibrarian.net/236372160/fuzzy_lines.png -- https://code.launchpad.net/~widelands-dev/widelands/beauti

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

2016-02-05 Thread GunChleoc
Right-angles lines look better with alpha 30, but slanted lines look better with alpha 80 slanted lines with alpha 80 suffer from jaggies. https://en.wikipedia.org/wiki/Jaggies Is there a way to make the alpha dependent on the angle of the line? -- https://code.launchpad.net/~widelands-dev/wide

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

2016-02-05 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1289943 into lp:widelands. Commit message: When a waresqueue disappears in a minimized constructionsite window, the contents no longer leak on screen. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug

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

2016-02-05 Thread GunChleoc
Sgrìobh SirVer na leanas 05/02/2016 aig 18:30: > You are a hard audience :). Fuzzy graphics make me physically ill, because I have some crossed wires in my brain, so I have to be ;) The last version is working for me. The seams aren't 100% perfect, but it's barely noticeable, so I think this can

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

2016-02-05 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/add_hint_to_map_info/+merge/285228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/add_hint_to_map_info. ___ Mailing list: https://launch

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

2016-02-06 Thread GunChleoc
The crash doesn't sound as if it is connected to this bug. Can you run Widelands in gdb to get a stack trace, and create a new bug report? We will also need the savegame. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers i

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1542238-log into lp:widelands

2016-02-06 Thread GunChleoc
LGTM, but I think we need some log output in the classes that call this function as well, in case the non-matching Immovable == nullptr. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1542238-log/+merge/285237 Your team Widelands Developers is requested to review the proposed merge of

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

2016-02-06 Thread GunChleoc
Review: Approve Tested and code LGTM. How about we add some more consistency in worker/production program names? e.g. we have: check_soldier playFX create_bob geologist-find The underscores are most common, so I am in favour of renaming playFX -> play_sound geologist-find -> geologist_find -

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

2016-02-06 Thread GunChleoc
Review: Approve Tested and code LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/fix_removal_of_ports/+merge/285235 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_removal_of_ports. ___ Mailing list

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

2016-02-06 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1542214 into lp:widelands. Commit message: Consistent ordering of OK/Cancel buttons - the OK button is always on the right for LTR languages, and on the left for RTL languages. Requested reviews: Widelands Developers (widelands

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

2016-02-06 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/add_hint_to_map_info/+merge/285228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/add_hint_to_map_info. ___ Mailing list: https://launchpad.net/~

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

2016-02-06 Thread GunChleoc
This is sort of my catch-all branch for string issues - I just fix whatever gets reported on Transifex here. It would be hard to come up with a good branch name each time. Is reusing the branch a problem for the commit history? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/

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

2016-02-06 Thread GunChleoc
Your solution is definitely better - will test :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1289943/+merge/285201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1289943. ___ Mailing list: https:/

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

2016-02-06 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1289943 into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1289943/+merge/285201 -- Your team Widelands Developers is subscribed to branch

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

2016-02-06 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/do_not_update_size_when_minimized/+merge/285277 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/do_not_update_size_when_minimized. ___ Ma

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

2016-02-06 Thread GunChleoc
Yes, that looks much better :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ Mailing list: https://l

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

2016-02-06 Thread GunChleoc
Review: Approve Works on Ubuntu as well, code LGTM :) Still has a codecheck error though - I will fix it. -- https://code.launchpad.net/~widelands-dev/widelands/parent_directory/+merge/285276 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/parent_directory. _

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

2016-02-06 Thread GunChleoc
Review: Approve Please have a look at my code review commit - there is a NOCOM question in there. Also pinging Tino, because some WIN32 includes have been removed. -- https://code.launchpad.net/~widelands-dev/widelands/dedicated_out_of_main/+merge/285268 Your team Widelands Developers is subscr

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1542238-log into lp:widelands

2016-02-06 Thread GunChleoc
Review: Approve OK, let's do that then :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1542238-log/+merge/285237 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1542238-log. ___ Mai

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

2016-02-07 Thread GunChleoc
Thanks! I'll wait until you're done with the .cc files, so we won't be both playing with the branch at the same time. -- https://code.launchpad.net/~widelands-dev/widelands/editor_help/+merge/283900 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_help.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-map_objects into lp:widelands

2016-02-07 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-map_objects into lp:widelands. Commit message: Fixed member variables in src/logic/map_objects, but not in its subdirectories. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/building-statistics-window-labels into lp:widelands

2016-02-07 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/building-statistics-window-labels into lp:widelands. Commit message: Fixes/Improvements to Building Statistics: - The labels below the buttons are now properly center-aligned - The text size of the labels below the buttons is now

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/building-statistics-window-labels into lp:widelands

2016-02-07 Thread GunChleoc
Thanks :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/building-statistics-window-labels/+merge/285292 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/building-statistics-window-labels. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-base-economy into lp:widelands

2016-02-07 Thread GunChleoc
Failure is fixed in trunk? So, this can go in. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-base-economy/+merge/285289 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-base-economy.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-world into lp:widelands

2016-02-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-world into lp:widelands. Commit message: Refactored member variable names in src/logic/map_objects/world. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1395278 in widelands: "Consol

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-tribes-a-p into lp:widelands

2016-02-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-tribes-a-p into lp:widelands. Commit message: Fixed member variable names in src/logic/map_objects/tribes from battle - partially_finished_building. Requested reviews: Widelands Developers (widelands-dev) Related bugs

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/1535296-cleanup-and-autofit into lp:widelands

2016-02-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/1535296-cleanup-and-autofit into lp:widelands. Commit message: Various font face and font size related fixes and cleanups: - Fixed bug where font face types were not recognized by the new font renderer ("Font file not found. Fa

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

2016-02-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_hint_space into lp:widelands. Commit message: MultilineTextarea now generates an empty line for "\n\n" rather than just a line break. Added "HINTS:" label to map hints in mapdetails.cc. Requested reviews:

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

2016-02-09 Thread GunChleoc
If I have only 1 \n = , the renderer will only create a newline, but not the space for a paragraph. We don't want spaces for paragraphs here, because that would break the semantics. So, we would need to change the parser to do some very special treatment for two tags in a row, which also feels

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/1535296-cleanup-and-autofit into lp:widelands

2016-02-09 Thread GunChleoc
You have seen the loop in building_statistics this weekend, I shifted it to Textarea :) I am planning to do something similar for buttons and will probably extract a common function then. -- https://code.launchpad.net/~widelands-dev/widelands/1535296-cleanup-and-autofit/+merge/285405 Your team

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

2016-02-09 Thread GunChleoc
I have added a comment to the source code. I just noted that we can't add \n to the descriptions in the map elemental packets, but that is a different problem (file reading/saving). -- https://code.launchpad.net/~widelands-dev/widelands/map_hint_space/+merge/285407 Your team Widelands Developers

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

2016-02-09 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/file_not_found_message into lp:widelands. Commit message: Added file paths to error messages in exceptions thrown by LayeredFileSystem. Removed unused member variables from filesystem_exceptions.h. Requested reviews: Widelands

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

2016-02-09 Thread GunChleoc
Review: Approve The PPA went through, so as soon as Windows is happy, this can go in IMO. -- https://code.launchpad.net/~widelands-dev/widelands/ppa_glbinding/+merge/285302 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ppa_glbinding.

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

2016-02-09 Thread GunChleoc
Maybe the conquer radius sould be big enough to include all possible portdock locations, and portdocks only then placed within that conquer radius? -- https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409 Your team Widelands Developers is requested to review the pr

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

2016-02-09 Thread GunChleoc
Duh, of course - what you would need is a minimum distance between ports. Checking if the field is already occupied might not be safe when 2 ports are being built at the same time, and only 1 space available for portdock for the second one. -- https://code.launchpad.net/~widelands-dev/widelands

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

2016-02-09 Thread GunChleoc
Review: Approve code Code LGTM, just a few nits. this can go in once they have been fixed & Travis has passed. Diff comments: > > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2016-02-08 17:25:17 + > +++ src/ai/defaultai.cc 2016-02-09 11:02:50 + > @@ -72

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

2016-02-09 Thread GunChleoc
That's the one - since the data types don't match, it's safer to keep your own one for now. Our time values are still a wild mix of int and uint and need to be cleaned up in general. -- https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_tweaks/+merge/285459 Your team Widelands

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

2016-02-09 Thread GunChleoc
We should still allow having the port space, but a port construction site might turn port spaces too close to it (e.g. within 2x conquer area) into normal fields? -- https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409 Your team Widelands Developers is requested

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/1535296-cleanup-and-autofit into lp:widelands

2016-02-09 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/1535296-cleanup-and-autofit/+merge/285405 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/1535296-cleanup-and-autofit. ___ Mailing list: https://l

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-tribes-p-r into lp:widelands

2016-02-09 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-tribes-p-r into lp:widelands. Commit message: Renamed member variables in src/logic/map_objects/tribes for partially_finished_building - requirements. Requested reviews: Widelands Developers (widelands-dev) Related bugs

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

2016-02-09 Thread GunChleoc
Merging trunk should have fixed the builds. -- https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_tweaks/+merge/285459 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_trainingsites_tweaks. ___ Mai

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

2016-02-09 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fit_button_text into lp:widelands. Commit message: Buttons will now automatically scale down their text if it is too wide. Removed unused function set_fontface from Textarea. Requested reviews: Widelands Developers (widelands-dev

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands. Commit message: Fixed checking for artifacts on a map. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1525706 in widelands: "Wincondition artifacts cou

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

2016-02-10 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_tweaks/+merge/285459 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_trainingsites_tweaks. ___ Mailing list: https://launchpad

<    5   6   7   8   9   10   11   12   13   14   >