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

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

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

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

2016-02-11 Thread GunChleoc
As I said before, there are no possible map loading crashes related to this branch. This code is only executed while saving a map, and then the only thing it does is write the "artifacts" tag. I tried and failed to just iterate over the fields - seems like there is no way to safely get the

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

2016-02-11 Thread GunChleoc
I am still trying to play with it to get rid of the jaggies. Slow going though. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines.

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

2016-02-10 Thread GunChleoc
No change, this is for LayeredFilesystem only. I can have a look at ZipFilesystem too though in a new branch :) -- https://code.launchpad.net/~widelands-dev/widelands/file_not_found_message/+merge/285442 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1543944-suggested-teams into lp:widelands

2016-02-11 Thread GunChleoc
I'll merge this now, so we can load those maps again ASAP. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543944-suggested-teams/+merge/285654 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1543944-suggested-teams.

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

2016-02-12 Thread GunChleoc
This is ready for the next round now. I have made a separate commit for each issue. There are still some NOCOMs left that can either go or that I need some information for. -- https://code.launchpad.net/~widelands-dev/widelands/editor_help/+merge/283900 Your team Widelands Developers is

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

2016-02-12 Thread GunChleoc
Mousewheel has been sort of broken since we moved to SDL2. -- 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. ___ Mailing

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

2016-02-12 Thread GunChleoc
Code LGTM, but I have added some comments. Please have a look :) Diff comments: > > === modified file 'src/scripting/lua_game.cc' > --- src/scripting/lua_game.cc 2016-01-28 05:24:34 + > +++ src/scripting/lua_game.cc 2016-02-12 17:03:35 + > @@ -1132,19 +1132,19 @@ > }; > >

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. ___

[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

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

2016-02-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_campaign_loading into lp:widelands. Commit message: Removed unneeded packages from campaign and tutorial maps to fix map loading. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https

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

2016-02-11 Thread GunChleoc
As long as I am not lost in translation, which would be bad for my job... :P -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/+merge/285566 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525706-artifacts.

[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/map_hint_space into lp:widelands

2016-02-13 Thread GunChleoc
Since is the best we can do for now functionality-wise, I'm gonna merge @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/map_hint_space/+merge/285407 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_hint_space.

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

2016-02-13 Thread GunChleoc
Thanks :) -- https://code.launchpad.net/~widelands-dev/widelands/fit_button_text/+merge/285528 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fit_button_text. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2016-02-13 Thread GunChleoc
Review: Resubmit Thanks for the code review - the branch is ready again. Note that I had to change a function from protected to public. -- https://code.launchpad.net/~widelands-dev/widelands/editor_help/+merge/283900 Your team Widelands Developers is subscribed to branch

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

2016-02-13 Thread GunChleoc
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-scripting/+merge/285909 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-scripting. ___ Mailing list:

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

2016-02-13 Thread GunChleoc
SirVer is out master of everything, but I have worked a bit on Lua and saveloading as well, so I think this change should be fine. I have opened a new bug. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-scripting/+merge/285909 Your team Widelands Developers

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

2016-02-13 Thread GunChleoc
I left the capability for \n it downwards compatibility really. This part of the code will be reworked anyway when we do the full switch to the new font renderer. I am not planning to do that switch for Build 19 though, because there are still to many issues with layouting images. If we want a

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

2016-01-28 Thread GunChleoc
Review: Approve LGTM @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/load_library/+merge/284218 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/load_library. ___ Mailing list:

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

2016-01-28 Thread GunChleoc
I had a look at http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1397500/view/head:/utils/win32/mingw/config.h and I don't know if the . in the datadir needs removing or something. SInce I can't test on Windows, it's hard for me to play with stuff. The variable that needs setting is

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

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

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

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.

[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/bug-1526916 into lp:widelands

2016-01-26 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1526916 into lp:widelands has been updated. Description changed to: When selecting a map, the parent directory now has a lower sort order than all other directories. For more details, see:

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

2016-01-26 Thread GunChleoc
When selecting a map, the parent directory now has a lower sort order than all other directories. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1526916/+merge/283912 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1526916

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

2016-01-26 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1526916 into lp:widelands has been updated. Commit Message changed to: When selecting a map, the parent directory now has a lower sort order than all other directories. For more details, see:

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

2016-01-26 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1526916 into lp:widelands. Commit message: When selecting a map, the parent directory now has a lower sort order than all other directories. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1526916

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

2016-01-27 Thread GunChleoc
Isn't it fun that 0 still evaluates to NULL... Code LGTM and tested. Travis also looks clean. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_huge_boxes/+merge/284176 Your team Widelands Developers is requested to review the proposed merge of

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

2016-01-27 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1397500 into lp:widelands has been updated. Commit Message changed to: Moved all data-related directories into a new "data" directory. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 --

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

2016-01-27 Thread GunChleoc
Review: Approve I can't reproduce the problem, so somebody else will need to test. Code LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/padding_in_atlas.

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

2016-01-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/editor_help into lp:widelands. Commit message: Exposed terrain and resource descriptions to the Lua interface and added tree and terrain help to the editor. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug

[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

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:

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:

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

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:

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

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:

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

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

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

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

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

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

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

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

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/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-1548932-editor-save-zip into lp:widelands

2016-02-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1548932-editor-save-zip into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1548932 in widelands: "Editor fails on save with zip filesystem" https://bugs.launchpad.net/wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website

2016-02-24 Thread GunChleoc
Thanks for testing - I think we're good to go now. Good luck with he Windows thing! -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team Widelands Developers is subscribed to branch lp:widelands-website.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website

2016-02-24 Thread GunChleoc
I updated the instructions to make MySQL optional. We still need to test the sqlite version though. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team Widelands Developers is subscribed to branch lp:widelands-website.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website

2016-02-24 Thread GunChleoc
Is there any partiular reason that you changed -e git://github.com/ubernostrum/django-registration/archive/0.8.zip/#egg=registration to https://github.com/ubernostrum/django-registration/archive/0.8.zip/#egg=registration ? --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread GunChleoc
Review: Resubmit Thanks for the hint - found it! :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546095-backslash-edit.

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

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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread GunChleoc
Review: Approve That broke it for Linus, but I have added an #ifndef that should fix it for everybody. I have tested with the zip option on and off. COuld you please test for Windows again to make sure that it's still working? --

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

2016-02-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/soldier_refactoring into lp:widelands. Commit message: Some refactoring for the Soldier code: - Refactored the battle attributes in SoldierDescr (health, attack, defense, evade) into a nice Lua table and struct. - Made member variables

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

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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread GunChleoc
Review: Needs Fixing This now works in Windows for the Zip Filesystem, but not for the normal file system. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers is subscribed to branch

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

2016-02-22 Thread GunChleoc
Thanks for the review :) Tree growth has nothing to do with this branch - the Last Bastion is already being redesigned to fit the new tree growth parameters https://wl.widelands.org/forum/topic/1917/ @bunnybot merge --

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

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

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

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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread GunChleoc
Me neither, which is why I caused this bug in the first place *lol -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546810-undo-redo.

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

2016-02-22 Thread GunChleoc
Changing this to a vector is complicated, so I'd like to get this branch in and leave that as a problem for another day. > Sorry, cannot keep up with email > > I think this can be a vector and that would probably be better. --

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

2016-02-22 Thread GunChleoc
This has been approved on the forum. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/balancing_tribes/+merge/286346 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/balancing_tribes into lp:widelands.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands. Commit message: Fixed undo/redo bug when drawing terrains in the editor. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1546810 in widelands: "Editor: undo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread GunChleoc
Review: Approve Now I get it - it's because of file locks. Everything works on Ubuntu now, so I am in favour of merging. Let's solve the problem with not being able to save twice in a new branch. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067

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

2016-02-22 Thread GunChleoc
I have found a safe upper limit for iterating over the fields now, so I'll be pushing something new as soon as I have compiled & tested it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/+merge/285566 Your team Widelands Developers is subscribed to branch

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

2016-02-22 Thread GunChleoc
Review: Approve Tested and LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_campaign_loading/+merge/285709 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_campaign_loading. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-23 Thread GunChleoc
> The current version does work for directory saves on windows. > > But if fails on the second save for a zip save: > If you start the editor and save the map "abc" and "abc" already exists it > gets overwritten correctly. > But you can't save again "abc" without restarting the editor (or save

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website

2016-02-23 Thread GunChleoc
Only if we also make it optional in the pip-requirements - the instructions need to match the files, otherwise everybody will to have research the error messages to find out why it fails. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team

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

2016-02-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread GunChleoc
I'd rather not wait for the backslash bug, because I don't know how to fix that one. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546095-backslash-edit.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website

2016-02-26 Thread GunChleoc
You are right, for some reason that package wants to be fetched with https. I have tested this again and made a small change - is sounded as if we needed sqlite for mysql. No idea what happend to the branch history. --

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

2016-02-28 Thread GunChleoc
Review: Approve Great :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_upgrading_reworked/+merge/287229 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_upgrading_reworked. ___ Mailing

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

2016-02-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/tree-values into lp:widelands. Commit message: New tree/terrain values by king_of_nowhere. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/tree-values

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

2016-02-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands-website/encyclopedia into lp:widelands-website. Commit message: Update the encyclopedia from JSON files. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #350465 in Widelands Website: "online_help re

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

2016-02-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_object_info into lp:widelands. Commit message: Created a new executable that will generate JSON files for updating the e3ncyclopedia on the website. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug

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

2016-02-29 Thread GunChleoc
OK, thanks for letting me know. Good luck with the move! -- https://code.launchpad.net/~widelands-dev/widelands/employers/+merge/287384 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/employers. ___ Mailing list:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip into lp:widelands

2016-02-29 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1548932-editor-save-zip into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip/+merge/287036 -- Your team

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

2016-02-29 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/map_object_info into lp:widelands has been updated. Commit Message changed to: Created a new executable that will generate JSON files for updating the encyclopedia on the website. For more details, see:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1513181-chat-overlay into lp:widelands

2016-02-25 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1513181-chat-overlay into lp:widelands has been updated. Description changed to: Brought back the chat overlay. We used to get a crash when an exception was raised while loading a map or game, so we need to check whether the ChatProvider

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1513181-chat-overlay into lp:widelands

2016-02-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1513181-chat-overlay into lp:widelands. Commit message: Fixed check in ChatOverlay whether a chat provider has been assigned. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1513181 in widelands

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

2016-02-29 Thread GunChleoc
My idea is to generate them on the server - I have added a call to the executable in update_help.py. It will also run a python script that checks for basic JSON validity. My idea is that they aren't part of the Widelands installation as such and that they shouldn't be packaged, so I prefer to

<    3   4   5   6   7   8   9   10   11   12   >