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

2016-02-10 Thread GunChleoc
This changed function is only called during saving, and it only adds a tag or not, so it's not related to the crash. Good idea of adding the map name to the output though; I will look into it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/+merge/285566 Your team Wi

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

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

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

2016-02-10 Thread GunChleoc
Putting this on hold to save Travis some work. -- 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 list: https://la

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

2016-02-10 Thread GunChleoc
> I would also fix find_portdock function +1 -- https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ship_and_portspaces into lp:widelands. __

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

2016-02-10 Thread GunChleoc
Review: Approve code I still want to do some testing, but code LGTM - just a few minor nits :) Diff comments: > > === modified file 'src/logic/map_objects/tribes/ship.cc' > --- src/logic/map_objects/tribes/ship.cc 2016-02-08 08:01:21 + > +++ src/logic/map_objects/tribes/ship.cc 20

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

2016-02-10 Thread GunChleoc
Review: Approve testing Testing went OK. -- https://code.launchpad.net/~widelands-dev/widelands/ship_and_portspaces/+merge/285409 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_and_portspaces. ___ Mailing list:

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

2016-02-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1543944-suggested-teams into lp:widelands. Commit message: - Fixed indexing error in SuggestedTeamsBox that would cause a crash - Added Widelands version to log output - Added map names to scoped timer for map loading/saving

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 lp:~widelands-dev/widelands/file_not_

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

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

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 size

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

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

2016-02-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/zip_file_error_messages into lp:widelands. Commit message: Added file and zip file paths to exceptions in ZipFilesystem. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

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 subscri

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 list

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 @@ > }; > > LuaMessage

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 i

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: https://launchpad.n

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

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 lp:~widelands-dev/widel

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-tribes-t-z into lp:widelands

2016-02-13 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-tribes-t-z into lp:widelands. Commit message: Refactored remaining member variables in tribes. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1395278 in widelands: "Consolidate nami

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

2016-02-14 Thread GunChleoc
Review: Approve code Not tested, but code LGTM. Maybe add a comment to the code to explain why we have the 2 separate intervals? -- https://code.launchpad.net/~widelands-dev/widelands/lock_game_logic/+merge/285980 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wideland

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

2016-02-14 Thread GunChleoc
You are right, that's a typo and needs to be a lowercase s. Looks like my compiler didn't care. I don't know how you can trigger the error message - I'd have to go through the code myself. The worst things that can happen with unicode filenames is that the path contains strange letters - I don

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

2016-02-14 Thread GunChleoc
Now we run into trouble with my crappy graphics. I'll try a build with glbinding to check if it gets any better. Starting program: /home/bratzbert/sources/widelands/opengl3/widelands [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_d

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

2016-02-14 Thread GunChleoc
@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. ___ Mailing list: https://launchpad.net/~widelands-de

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

2016-02-14 Thread GunChleoc
This is how SirVer triggered the bug: run widelands with --maxfps=10 and host a game, run a second one with --maxfps=60 and join that game -> immediate desyncs. -- https://code.launchpad.net/~widelands-dev/widelands/lock_game_logic/+merge/285980 Your team Widelands Developers is subscribed to br

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

2016-02-14 Thread GunChleoc
Now the glbinding variant - it will cause the texture bug with me that was only found on Windows before. The reason might again be my crappy graphics though, because the Windows build that Tino provided will also crash. I have known problems on both of my machines with some projects that use Ope

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

2016-02-14 Thread GunChleoc
@bunnybot merge -- 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 list: https://launchpad.net/~widelands-dev Post

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

2016-02-14 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1395278-network into lp:widelands has been updated. Commit Message changed to: Refactored member variable names in src/network. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-network/+merge/285990 --

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

2016-02-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1544864 into lp:widelands. Commit message: Removed LuaBaseImmovable::get_size. The corresponding functions in LuaBuildingDescription and LuaImmovableDescription now return strings instead of ints for consistency and easier reading

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

2016-02-14 Thread GunChleoc
Sounds good to me :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/lock_game_logic/+merge/285980 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lock_game_logic. ___ Mailing list: https://lau

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

2016-02-15 Thread GunChleoc
Review: Approve code Code LGTM -- https://code.launchpad.net/~widelands-dev/widelands/syncstream_on_option/+merge/286004 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/syncstream_on_option. ___ Mailing list: https:/

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

2016-02-15 Thread GunChleoc
Also FYI: Thanks to Kaputtnik, I can now switch to my NVidia grahics on Windows, but my Linux computer only has Intel graphics, so I'm stuck with the outdated/buggy driver there. -- https://code.launchpad.net/~widelands-dev/widelands/opengl3/+merge/285967 Your team Widelands Developers is reques

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

2016-02-15 Thread GunChleoc
I don't speak Django, but I went through it with my proofreader glasses on and have some suggestions. Diff comments: > > === added file 'templates/wlmaps/edit_comment.html' > --- templates/wlmaps/edit_comment.html1970-01-01 00:00:00 + > +++ templates/wlmaps/edit_comment.html

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

2016-02-15 Thread GunChleoc
Tested deleting of old replay files and added a string tweak. I think this is ready now. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/syncstream_on_option/+merge/286004 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/syncstream_on_opt

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

2016-02-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/listselect into lp:widelands. Commit message: - Listselect now uses the new font renderer - Implemented locale fontset selection by word into the new renderer. - Fontsets now have a representative character that is used to calculate line

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

2016-02-15 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/listselect into lp:widelands has been updated. Commit Message changed to: - Listselect now uses the new font renderer, and text is aligned according to rtl/ltr per entry. - Implemented locale fontset selection by word into the new renderer. - Fo

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

2016-02-15 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/listselect into lp:widelands has been updated. Description changed to: - Listselect now uses the new font renderer - Implemented locale fontset selection by word into the new renderer. - Fontsets now have a representative character that is used t

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

2016-02-15 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1395278-network into lp:widelands has been updated. Commit Message changed to: Refactored member variable names in src/network and src/profile. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-network/+m

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

2016-02-15 Thread GunChleoc
Review: Approve I have fixed a few cases of overgeneration, this is good to go now. The potential memory leak should be investigated. I am not familiar with the networking code, but maybe we could use a unique_ptr there? @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bu

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

2016-02-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1509172 in widelands: "editor gives error on saving maps" https://bugs.launchpad.net/widelands/+b

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-lan-autosave into lp:widelands

2016-02-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix-lan-autosave into lp:widelands. Commit message: Fixed crash with identical autosave filenames when LAN game is run with multiple instances of Widelands on a single computer. Also, more informative error messages in

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

2016-02-15 Thread GunChleoc
I used the language menu of Battle for Wesnoth as a model for the left/right alignment. So yes, text aligning is per entry - I am checking if there is an RTL character in the entry or not. The left-aligned strings in the encyclopedia etc. are untranslated strings - once they get translated, the

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

2016-02-15 Thread GunChleoc
I can't download the linked build - do you have the error message? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1509172-map-saving-paths. __

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

2016-02-15 Thread GunChleoc
Nevermind, the link worked on the 2nd try. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1509172-map-saving-paths. __

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

2016-02-15 Thread GunChleoc
> Thanks for proofreading :-) > > To the weird indentaion of *.py files: This is what pyformat does. OK - manually fixing after pyformat doesn't make sense. > > Can ^(?P[-\w]+) be refactored into a variable? > > This is a regular expression and the normal way Django searches for URLs to > prov

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

2016-02-15 Thread GunChleoc
> Why are maps not loading now? I mean, should unneeded packages not simply be > ignored? I am afraid that some of the changes are not harmless but I am > not positive. They are not ignored, because scenarios always load all packets - scenarios use the same code path as savegames, so the drop

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

2016-02-15 Thread GunChleoc
In the error message I got, the path was missing all \. I need to add some more log output so we can get more information as to at what point the path gets messed up. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-tribes-t-z into lp:widelands

2016-02-15 Thread GunChleoc
Lots - if we put them all into 1 branch, we would go blind trying to read the diff :P I think that the worst is over now though :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-tribes-t-z/+merge/285969 Your team Widelands Developers is subscribed to branch lp:~widelands-dev

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

2016-02-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-underscores into lp:widelands. Commit message: Removed leading underscores from variable and function names. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

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

2016-02-16 Thread GunChleoc
I still need help with this before we can go ahead: > I tried and failed to just iterate over the fields - seems like there is no > way to safely get the size of a std::unique_ptr. > > Why is it an array and not a vector anyway? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-

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

2016-02-16 Thread GunChleoc
> I just checked and the extra_data packet is required to load the map images > that can be accessed using map:blub.png: http://bazaar.launchpad.net > /~widelands- > dev/widelands/trunk/view/7837/src/map_io/map_extradata_packet.cc#L43. So these > need to be reverted for sure. No, we don't need the

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

2016-02-16 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/network-memory into lp:widelands. Commit message: InternetGaming::games() and InternetGaming::clients() now return nullptr instead of a new vector in case of a communication failure. Requested reviews: Widelands Developers (widelands

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

2016-02-16 Thread GunChleoc
Travis went through. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-underscores/+merge/286114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-underscores. ___ Mailing l

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

2016-02-16 Thread GunChleoc
Just one style change that I would make: With very short descriptions and small maps, the "Hint" header is aligned beside the minimap image, but the hint text below the minimap. So, align everything to leave space for the image, or show the hint header + text below the image. -- https://code.l

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

2016-02-16 Thread GunChleoc
Looks good :) -- https://code.launchpad.net/~widelands-dev/widelands-website/add_hints/+merge/285664 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widela

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

2016-02-16 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1542705 into lp:widelands. Commit message: Renamed program "geologist-find" to "geologist_find" and "playFX" to "play_sound". Requested reviews: Widelands Developers (widelands-dev) R

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

2016-02-16 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands. Commit message: Fixed crash when editor text field ends in \. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1546095 in widelands: "Crash when typing &

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

2016-02-17 Thread GunChleoc
The vector member variable is being kept around - the new vector was only being created locally in the function in case of communication error. I say it makes sense in case of a communication error to simply not update anything. -- https://code.launchpad.net/~widelands-dev/widelands/network-memo

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

2016-02-17 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1546153-suggested-teams into lp:widelands has been updated. Commit Message changed to: The editor now writes the suggested teams to the elemental map packet. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1546

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

2016-02-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1546153-suggested-teams into lp:widelands. Commit message: The editor now writes the suggested teams to the elemental map packet. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https

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

2016-02-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/balancing_tribes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/balancing_tribes/+merge/286346 This is not ready yet, just putting

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

2016-02-18 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/codecheck-braces into lp:widelands. Commit message: Added a codecheck rule to require a space before opening braces. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands

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

2016-02-18 Thread GunChleoc
I haven't been able to figure out why the \ disappear. I still think that we should merge this though, because that's better than a crash. I have added a TODO comment to the code. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands

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

2016-02-18 Thread GunChleoc
Review: Needs Fixing I have fixed up some data types and added some NOCOMs. -- 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. __

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

2016-02-18 Thread GunChleoc
I could take care of splitting the ai_hintsh/.cc, since I'm waiting for a bunch of reviews anyway :) -- 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. _

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

2016-02-18 Thread GunChleoc
Maybe we could show a message to indicate the error somehow? -- https://code.launchpad.net/~widelands-dev/widelands/network-memory/+merge/286162 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/network-memory into lp:widelands. _

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

2016-02-18 Thread GunChleoc
Review: Approve All done. Please double-check my code changes and wait for Travis before merging. -- 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. ___

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

2016-02-18 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Various string fixes: - Added localization marker for production program names - Fixed stone -> granite in Atlantean campaign - Fixed grammar in Empire campaign - Correct use of Unic

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

2016-02-19 Thread GunChleoc
Banging my head against the wall, basically. I think I will just have to make sure that nothing's fuzzy and live with the jaggies for now. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widel

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

2016-02-19 Thread GunChleoc
Banging my head against the wall, basically. I think I will just have to make sure that nothing's fuzzy and live with the jaggies for now. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widel

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

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

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

2016-02-22 Thread GunChleoc
Thanks for testing! The code change is trivial, so I'm gonna merge. @bunnybot merge -- 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. __

[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/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? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-m

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 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-logic1/+mer

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: https://launchpad.net/~widelands-

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: https://launchpad.net/~widelands-de

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 lp:~widelands-dev/widelands/bug-150

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: https://launchpad.net/~wideland

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

2016-02-22 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/balancing_tribes into lp:widelands has been updated. Commit Message changed to: Balancing: Added gold to building cost for Atlantean training sites. Made Barbarian attack stronger. For more details, see: https://code.launchpad.net/~widelands-de

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 Po

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.

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 lp:~widela

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

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

2016-02-22 Thread GunChleoc
Review: Approve I was unable to improve on this, so let's merge it as it is. It's is a great improvement on what we had before in any case :) I have removed the now unused LineDrawMode. Unless SirVer wants to do something else with the code yet, this can go in. -- https://code.launchpad.net/~w

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

2016-02-22 Thread GunChleoc
I'll test your changes :) > Why does creating a MapSaver object with new not work on linux? Why do we need this to be a pointer anyway? It only adds an extra line of code. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Develo

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 Y

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. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-

[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 This will

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-22 Thread GunChleoc
I had been wondering if pip-requirements was still current, since I had to fix some stuff, and the configuration later on isn't working. I'll post more about that in a new bug maybe. libmysqlclient-dev is needed for MySQL-python. The other package that I changed has moved its repository to Gith

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

2016-02-22 Thread GunChleoc
This is actually the wrong version of django-registration, I will have to track down an older version. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widel

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