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

2014-11-22 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/ui_fixes into lp:widelands has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ui_fixes/+merge/242561 -- Your team Widelands Developers is requested to review the prop

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

2014-11-22 Thread GunChleoc
Filed a bug report for the Alt problem: https://bugs.launchpad.net/widelands/+bug/1395322 -- https://code.launchpad.net/~widelands-dev/widelands/ui_fixes/+merge/242561 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ui_fixes into lp:widelan

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

2014-11-22 Thread GunChleoc
Review: Approve LGTM, will merge -- https://code.launchpad.net/~widelands-dev/widelands/save_minimap/+merge/242567 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/save_minimap. ___ Mailing list: https://launchpad.net

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

2014-11-22 Thread GunChleoc
Running clang-format is good :) Doesn't work on my system though :( -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/seafaring-ai into lp:widelands. __

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

2014-11-23 Thread GunChleoc
Review: Approve You inherited a strange comment in line 3112 that you might want to fix as well. Otherwise, LGTM and tested. Diff comments: > === modified file 'src/graphic/CMakeLists.txt' > --- src/graphic/CMakeLists.txt2014-11-08 14:59:03 + > +++ src/graphic/CMakeLists.txt

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

2014-11-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1219914 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1219914 in widelands: "Lots of warnings "internationalized messages should not contain the '\r' escape

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

2014-11-26 Thread GunChleoc
Review: Approve We should turn the int type thing into a general cleanup task with clear guidelines. I have tended to use uin8_t especially for enum classes, because it will save on memory. However, uint8_t also involves a lot of type casts, e.g. with boost::format. I lack the experience to jud

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

2014-11-26 Thread GunChleoc
No, that was just me being lazy when I added it to the debug screen. -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. ___ Mail

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

2014-11-26 Thread GunChleoc
I have had a liik at the code now - maybe you could move the dst.blit( part outside the if/else again, this way we get less code. const std::string node_text will then also need to be declared outside and lose the const. When you remove the gametime from the editor, don't forget to move the FPS

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

2014-11-27 Thread GunChleoc
LGTM, except for a couple more nits. One functionality change: - In the editor, remove the blank space between ( and the first coordinate And two code style nits: - add operator padding to (is_game)?25:5 (codecheck doesn't catch this case, but it should look like this: (is_game) ? 25 : 5) - P

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

2014-11-27 Thread GunChleoc
Can you please add some regression tests as well? They should go in test/maps/lua_testsuite.wmf/scripting/flag.lua You can run these tests directly without having to run the whole test suite: ./widelands --scenario=test/maps/lua_testsuite.wmf I have also spotted a NOCOM comment in the diff - pl

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

2014-11-27 Thread GunChleoc
Review: Approve They are, except for the first variable. That looks weird, so I have removed it. Going to merge now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. __

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

2014-11-27 Thread GunChleoc
No problem. Let me know if you need help with the Lua tests, I have written a few simple ones for the building descriptions. -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-7688

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

2014-11-27 Thread GunChleoc
My best guess is that #field.roads doesn't work because you have an associative array rather than an indexed one in your table. Is there a particular reason you need to count roads in your test? You could test for the 6 directions individually if they're there or not. -- https://code.launchpad.

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

2014-11-27 Thread GunChleoc
Review: Resubmit Time for the next round. FontSet now has its own class and parses itself. The singleton is gone - FontHandler1 now does the job. I pulled TextStyle out of the basic font class to avoid circular dependencies, and moved: src/wui/text_constants.h => src/graphic/text_constants.h s

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

2014-11-28 Thread GunChleoc
Thanks - I have fixed it. Probably got garbled in a merge from trunk. -- https://code.launchpad.net/~widelands-dev/widelands/fonts/+merge/238608 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fonts. ___ Mailing list:

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

2014-11-28 Thread GunChleoc
global? general? wl-lib? common? core? root? shared? While we're restructuring, should we separate wl/game and wl/editor? -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_game_renderer/+merge/243124 Your team Widelands Developers is requested to review the proposed merge of lp:~wid

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

2014-11-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/delete_deprecated into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/delete_deprecated/+merge/243174 Got rid of base/deprecated.h

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

2014-11-28 Thread GunChleoc
Bugs for Tino's issues have been filed: https://bugs.launchpad.net/widelands/+bug/1397301 https://bugs.launchpad.net/widelands/+bug/1397302 I am getting compiler warnings: src/graphic/image_cache.cc:40:13: warning: declaration of ‘texture’ shadows a member of 'this' [-Wshadow] Texture* tex

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

2014-11-29 Thread GunChleoc
I just noticed that the compiler warnings come up on trunk as well, so they're not caused by this particular branch. -- https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/texture_atlas

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

2014-11-29 Thread GunChleoc
I haven't had time to look over all of the code yet, but I've tested it and it seems to work fine. If you think that's sufficient, go ahead and merge. Otherwise, I'll try to have a look tomorrow. Brain's not working today. -- https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+mer

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

2014-11-29 Thread GunChleoc
+1 to renaming. Do we want to do that here or in a separate bug? I think doing it here might be a good idea, so we will have it in before we expose it to the Lua interface. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837 Your team Widelands Developers is subscrib

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

2014-11-29 Thread GunChleoc
> set -ex or something along these lines. What is -ex? Diff comments: > === added file 'utils/merge_and_push_translations.sh' > --- utils/merge_and_push_translations.sh 1970-01-01 00:00:00 + > +++ utils/merge_and_push_translations.sh 2014-11-25 12:53:25 + > @@ -0,0 +1,22 @@ > +

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

2014-11-30 Thread GunChleoc
I added diff comments on lines 1244 and 1467 for things to double-check. Diff comments: > === modified file 'src/editor/editorinteractive.cc' > --- src/editor/editorinteractive.cc 2014-11-23 14:34:38 + > +++ src/editor/editorinteractive.cc 2014-11-28 07:21:07 + > @@ -243,8 +243,6 @@ >

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

2014-11-30 Thread GunChleoc
This doesn't work on my Ubuntu. If I hit f, the fullscreen menu only shifts to the top left. Then, when I move the mouse, I get some wild toggling around the window. If I previously started a game, it contains game content around the fs menu. Clicking on the screen seems to fix it. I can't prope

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

2014-11-30 Thread GunChleoc
Review: Resubmit Next round - replaced upcast with dynamic_cast, but only for the statements that I introduced. typeid(building) is also gone. -- https://code.launchpad.net/~widelands-dev/widelands/delete_deprecated/+merge/243174 Your team Widelands Developers is subscribed to branch lp:~widel

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

2014-11-30 Thread GunChleoc
Added a streamlining idea. Diff comments: > === modified file 'src/map_io/CMakeLists.txt' > --- src/map_io/CMakeLists.txt 2014-11-22 15:27:45 + > +++ src/map_io/CMakeLists.txt 2014-11-28 07:33:28 + > @@ -84,7 +84,6 @@ > map_terrain_packet.h > map_version_packet.cc > map_ver

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

2014-11-30 Thread GunChleoc
Review: Approve Working without problems on Ubuntu. Do we need a Windows test on this as well? Code LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/move_mapview_children/+merge/243233 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/move_mapview_ch

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

2014-12-01 Thread GunChleoc
My terminal doesn't seem to know pushd/popd, so I have added some tests with ls | grep. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1219914/+merge/242772 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1219914. __

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

2014-12-01 Thread GunChleoc
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/texture_atlas. ___ Mailing list: https://launchpad.net/~wideland

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

2014-12-01 Thread GunChleoc
Maybe we could override f with "do nothing" in FullscreenMenuBase, until we can fix this up? Better no functionality than something that will be perceived as buggy by the user. -- https://code.launchpad.net/~widelands-dev/widelands/f_for_fullscreen/+merge/243227 Your team Widelands Developers is

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

2014-12-01 Thread GunChleoc
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/use_sdl_image_in_one_place/+merge/243120 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/texture_atlas. ___ Mailing list: https://launchpad.

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

2014-12-01 Thread GunChleoc
Sounds good to me. Do you want o change the directories in this branch, or shall we have a new branch for that? -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_game_renderer/+merge/243124 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev

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

2014-12-01 Thread GunChleoc
> @GunChleoc - re observers - there is one point why vectors are suitable - they > are ordered and have a front member that can be moved to the back. This is > used when doing various kinds of check - like check one building every 10 > seconds. That's a valid point, so ignore my

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

2014-12-01 Thread GunChleoc
> //ref_cast const>(b).building().name().c_str()); > dynamic_cast((b).building().name().c_str())); > > commented out is before, the second one is what I want to use. Before it used > to compile, now it complains: > > defaultai.cc:3766:48: error: 'const class Widelands::Building' has no member >

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

2014-12-02 Thread GunChleoc
Review: Approve If you think that this is better, file a new bug and merge :) -- https://code.launchpad.net/~widelands-dev/widelands/f_for_fullscreen/+merge/243227 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/f_for_fullscreen. __

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

2014-12-03 Thread GunChleoc
> No more big branches, this is why I enjoyed these two (or three) small > branches I did lately (including this one and tha LUA resource think - though > this gone wild from one-line change). This has happened to me too and will keep happening - one day I will learn that there are no quick fixes

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

2014-12-04 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/codecheck_sort into lp:widelands has been updated. Commit Message changed to: Added codecheck rule to include when std::sort is used. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/codecheck_sort/+merge/243651 -- Yo

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

2014-12-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/codecheck_sort into lp:widelands. Commit message: Added codecheck rule to include when std::sort is used. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev

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

2014-12-04 Thread GunChleoc
Review: Approve Fixed 2 nits myself + tested. LGTM. I love these graphic changes, Widelands is now noticeably faster on my machine. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_game_renderer/+merge/243124 Your team Widelands Developers is subscribed to branch lp:~widelands-dev

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

2014-12-04 Thread GunChleoc
I have done some testing now. I ran into 2 issues: 1. Fellowships: The space is too tight for the AI to manoeuvre the ships. Pathfinding is always tricky though, so I don't think we need to fix it in this branch. 2. Together We're Strong: By the time the AI had build enough military buildings,

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

2014-12-04 Thread GunChleoc
I'd say just do the roads stuff in this branch and merge it. The warehouse thing is separate code, so it's better to have 2 branches and keep the changes smaller. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1380286/+merge/242975 Your team Widelands Developers is subscribed to bran

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

2014-12-05 Thread GunChleoc
2. Your approach means that mapmakers will have to change their maps so the AI can deal with them. Check out get_port_spaces() in map.h, this will give you a list of all port spaces on the map, so it could be used to let the AI "cheat". Add them to the list of blocked fields for everything else

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

2014-12-05 Thread GunChleoc
I think it is a viable suggestion to work from both ends. I didn't know about the roads problem - maybe it would help to have some sort of safety margin around the port plots where no flags can be set - or if there's a road there, set the flag and dismantle it, so that the road will disappear?

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

2014-12-05 Thread GunChleoc
anything with the shaders yet, which started the whole thing. 5. Since this is a huge diff, I have added NOCOM(GunChleoc) comments to the files to focus the review http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1397500/revision/7335. Also, the installers need testing - I have added NOC

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

2014-12-06 Thread GunChleoc
Review: Resubmit *ding ding ding* Round 3. There's one remaining NOCOM comment in src/graphic/text/rt_render.cc [1]. I think it can be deleted, but I put it there just in case. Regarding the text_layout/text_constants problem, this is being refactored in the fh1 branch anyway - we should revis

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

2014-12-06 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fonts into lp:widelands has been updated. Commit Message changed to: Fonts are now locale-dependent rather than being chosen by the user. - Locales and their fonts are now defined in the new i18n directory. Moved the font files there and added

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

2014-12-06 Thread GunChleoc
> I have very little time this weekend, but wanted to give you quick feedback > right away. > > [moving of dirs and splitting graphic into sub directories] > great change. > > > So, I decided to do some overhaul: > > Would have been better to do that in trunk, so that the data move is > independ

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

2014-12-06 Thread GunChleoc
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/remove_gray/+merge/243631 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_cached_resizing. ___ Mailing list: https://launchpad.net/~w

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

2014-12-07 Thread GunChleoc
I replaced 'ls | grep' with '-f' and optimized a bit. pushd is still an unknown command. If I try this: #!/bin/bash pushd /etc I get: merge_and_push_translations.sh: 3: merge_and_push_translations.sh: pushd: not found -- https://code.launchpad.net/~widelands-dev/widelands/bug-121

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

2014-12-07 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Commit Message changed to: Fixed text domains for campaign selection. Improved "You are Player x/a spectator" string in LaunchMPG. For more details, see: https://code.launchpad.net/~widelands-dev

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

2014-12-07 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Fixed text domains for campaign selection. Improved "You are Player x/a spectator" string in LaunchMPG. Requested reviews: Widelands Developers (widelands-dev) For more de

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

2014-12-08 Thread GunChleoc
I did run it with sh explicitly, because otherwise I got a "permission denied" error. After the chmod, it is now working. Do you still want me to change from cd to pushd? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1219914/+merge/242772 Your team Widelands Developers is subscribed

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

2014-12-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/ai_remove_iterators into lp:widelands with lp:~widelands-dev/widelands/seafaring-ai as a prerequisite. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands

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

2014-12-08 Thread GunChleoc
OK, next try. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1219914/+merge/242772 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1219914. ___ Mailing list: https://launchpad.net/~widelands-dev Post t

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

2014-12-09 Thread GunChleoc
Review: Approve LGTM. When bringing back the playercolors in the icon grid, remember to check if this bug is gone: https://bugs.launchpad.net/widelands/+bug/1370144 -- https://code.launchpad.net/~widelands-dev/widelands/remove_player_color/+merge/243896 Your team Widelands Developers is subscri

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

2014-12-09 Thread GunChleoc
Did you forget to push something? I do need instructions on how to reproduce the crash, because I'm not getting it. -- https://code.launchpad.net/~widelands-dev/widelands/fonts/+merge/238608 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fonts. __

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

2014-12-10 Thread GunChleoc
Review: Approve 2 comments to think about, otherwise LGTM. Diff comments: > === modified file > 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc' > --- src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc > 2014-12-04 09:00:20 + > +++ src/editor/ui_menus/editor_too

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

2014-12-10 Thread GunChleoc
Thanks - you have given me an analysis of the problem now, but I still don't know how to trigger the crash. -- https://code.launchpad.net/~widelands-dev/widelands/fonts/+merge/238608 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fonts. __

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

2014-12-10 Thread GunChleoc
Duh, I didn't get it that you were running an external test - I only tested this in-game. I take it the old richtext renderer is used in scenario dialogs and / the building help? When I run this: ./build/src/graphic/text/test/wl_render_richtext 373 blub.png src/graphic/text/test/data/sub_fixed

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

2014-12-10 Thread GunChleoc
OK, tried that, replaced g_fh1 with g_fh. Same crash in the test, because the test doesn't have any font handler at all. The result if any such test will depend on the fonts used in any case. What is the best strategy to give the test a font set? Because every time we change the fonts (e.g. when

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

2014-12-11 Thread GunChleoc
*ding ding ding ding* Round 4. I have handed the FontSet to the Renderer and NodeStyle now. Crash is gone. There is still a reference to g_fh1 in graphic/text_parser.cc. Changing this would be a lot of work though, and since the old renderer is death bound anyway, I would rather not bother. --

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

2014-12-12 Thread GunChleoc
Neither can I, seems to be gone or hiding. It was about changing the enum to an enum class - the change has the advantage that there is less danger of another enum using the same name and the code jumping on the wrong enum. We are planning to move from enums to enum classes in general. https://

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

2014-12-13 Thread GunChleoc
Thanks, this makes the diff a lot smaller :) Give us a shout when you're ready again. -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/seafaring-ai. __

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian

2014-12-15 Thread GunChleoc
> Updated to take into account that the fonts directory has been moved into > i18n, please re-review this. :) > > (debian/copyright should probably be updated with the various licenses the new > fonts are available under, but I don't have a complete overview for this) I have dropped a license fil

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

2014-12-15 Thread GunChleoc
//NOCOM - how is it, when I added class here I have to cast everything Because enough_ships isn't of the enum class' type. You will get rid of the cast if you do something like this: enum class FleetStatus: uint8_t {kNeedShip = 0, kEnoughShips = 1, kDoNothing = 2 }; FleetStatus enough_ships =

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

2014-12-16 Thread GunChleoc
Correct, your type is the enum class name now. If you don't give the enum class itself an explicit type, it will default to int, which would be fine in this case. You also don't need to assign numbers to the members, this is entirely optional and should only be done when you explicitly depend o

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

2014-12-17 Thread GunChleoc
Review: Resubmit RTL support is coming :) This means a new dependency though, which is the ICU library. It comes with all kinds of i18n bells and whistles that I will play some more with for Build 20. For now, it would be good if our packaging wizards could double-check that the new library wi

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

2014-12-20 Thread GunChleoc
Thanks, I will look into this when I get back home :) -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1. ___ Mailing list: https://launchpad.n

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

2014-12-21 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/ai_remove_iterators into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_remove_iterators/+merge/243894 -- Your team Widelands Developers i

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

2014-12-21 Thread GunChleoc
Definitely, I just wanted an opinion before I continue :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_remove_iterators/+merge/243894 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_remove_iterators into lp:widelands. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/copyright-file into lp:~widelands-dev/widelands/debian

2014-12-22 Thread GunChleoc
I used diff comments to add some more info. Diff comments: > === modified file 'debian/copyright' > --- debian/copyright 2014-12-13 12:37:38 + > +++ debian/copyright 2014-12-21 15:51:53 + > @@ -22,6 +22,96 @@ > On Debian systems, the complete text of the GNU General Public > License

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/move-two-fonts into lp:widelands

2014-12-27 Thread GunChleoc
Review: Approve No, it's all done by the lua config - cmake etc only care about the i18n or fonts directory. -- https://code.launchpad.net/~widelands-dev/widelands/move-two-fonts/+merge/245380 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/move-two-fonts. __

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

2015-01-12 Thread GunChleoc
Please don't forget to document the options in the widelands console help texts (src/wlapplication_messages.cc). -- https://code.launchpad.net/~widelands-dev/widelands/rolling_autosave/+merge/246061 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rolling_autosa

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

2015-01-22 Thread GunChleoc
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/remove_hosting_limitation/+merge/247221 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_hosting_limitation. ___ Mailing list: https:/

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

2015-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1412242 into lp:widelands. Requested reviews: Tino (tino79) Related bugs: Bug #1406298 in widelands: "Load game screen lists campvis file" https://bugs.launchpad.net/widelands/+bug/1406298 Bug #1412242 in

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

2015-01-29 Thread GunChleoc
I added a NOCOM - there is also a second NOCOM that I don't have an answer for. I also did some testing, and got no crashes. - On the Fellowships map, 1/3 AIs managed to start building a shipyard and port about 30 minutes into the game. The shipyard was correctly stopped until the port got fini

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

2015-01-30 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1374831 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1374831 in widelands: "Terrain names in terrains/init.lua incosistent" https://bugs.launchpad.net/widelands/+bug/13

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

2015-01-30 Thread GunChleoc
My testing was done to see if anything crashes, and to check if behaviour is OK. I think it is OK for now - I just decided to give detailed feedback so we know what can be improved further. Once the 2 remaining NOCOMS are fixed, I think this branch is ready to be merged :) -- https://code.laun

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/unused-option into lp:~widelands-dev/widelands/debian

2015-01-30 Thread GunChleoc
Review: Approve The parameter rings a bell. LGTM. -- https://code.launchpad.net/~hjd/widelands/unused-option/+merge/248152 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/debian. ___ Mailing list: https://launchpad.n

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

2015-01-30 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1408775 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1408775 in widelands: "Make autocrat & territorial lord the last win conditions, make Collectors the first

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

2015-01-31 Thread GunChleoc
I showed the game to a native speaker of American English and she played the first 2 tutorials. She hit a spot in the tutorial where a building was mentioned, but she didn't recognize that the text was referring to a game entity, because the building name was in lower case. She said it would be

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

2015-01-31 Thread GunChleoc
I have some code duplication because of the circular dependency with lua_table.h Shall we wait until you have figured out separating this? Diff comments: > === added file 'scripting/win_conditions/init.lua' > --- scripting/win_conditions/init.lua 1970-01-01 00:00:00 + > +++ scripting/win_con

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

2015-02-02 Thread GunChleoc
I like the idea for links - so let's leave the capitalization for now and I'll change the real bugs in a separate branch. @Teppo: Have you tried using Virtaal or PoEdit? Launchpad won't recognize similar strings with slight changes in them, but these tools will. I will probably do another round

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

2015-02-02 Thread GunChleoc
Transifex can handle fuzzy matches, so I will set up a test project over there. https://www.transifex.com/projects/p/widelands/ -- https://code.launchpad.net/~widelands-dev/widelands/bug-1406301/+merge/247513 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-

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

2015-02-03 Thread GunChleoc
Yes - please leave it open until I can port the fixes we do want to a new branch. I'll change the status myself then. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1406301/+merge/247513 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1406301.

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

2015-02-05 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/capitalized_unit_names into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/capitalized_unit_names/+merge/247513 -- Your team Widelands Developers is

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

2015-02-05 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1406301 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1406301 in widelands: "Various strings need fixing" https://bugs.launchpad.net/widelands/+bug/1406301 For more de

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

2015-02-05 Thread GunChleoc
Review: Approve I have added a needed include. Compiles and runs without problems otherwise. -- https://code.launchpad.net/~widelands-dev/widelands/split_lua_table/+merge/248192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/split_lua_table. _

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

2015-02-05 Thread GunChleoc
Review: Approve I have moved the ScoutingDirection enum into ship.h and fixed up the code so it won't get used as boolean. Everything else LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~wideland

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

2015-02-05 Thread GunChleoc
I have pushed a code review. Just split up the tests, and we're good to go. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1380286/+merge/242975 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1380286. __

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

2015-02-05 Thread GunChleoc
Review: Needs Fixing Houston, we have e problem: test_rip_first_port_with_worker_in_portdock.lua hangs. -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/seafaring-ai. ___

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

2015-02-05 Thread GunChleoc
I see the same as SirVer - tests work in trunk. -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/seafaring-ai. ___ Mailing list: https:/

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

2015-02-06 Thread GunChleoc
Review: Resubmit Common code now resides in GameSettings. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1408775/+merge/248181 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1408775. ___ Mailing list

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

2015-02-07 Thread GunChleoc
I just grabbed myself a fresh trunk and the tests still go through there. Is there a way to run test_rip_first_port_with_worker_in_portdock.lua without running the whole testsuite? ./widelands --scenario=test/maps/ship_transportation.wmf doesn't work. -- https://code.launchpad.net/~widelands-dev

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

2015-02-08 Thread GunChleoc
I'm still on Boost 1.54 -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/seafaring-ai. ___ Mailing list: https://launchpad.net/~wideland

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

2015-02-08 Thread GunChleoc
Test won't run at all with ./regression_test.py -r test_rip_first_port_with_worker_in_portdock - I get a file not found. Tibor's method works though, here is the relevant output: Trying to run: map:scripting/init.lua: done Trying to run: test/maps/ship_transportation.wmf/scripting/test_rip_firs

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

2015-02-08 Thread GunChleoc
Review: Approve LGTM. We had discussed different road textures for different terrains though rather than using them at random. Maybe something for another branch? -- https://code.launchpad.net/~widelands-dev/widelands/busy_roads_for_buildings/+merge/249013 Your team Widelands Developers is subsc

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

2015-02-09 Thread GunChleoc
Yes, trunk runs all the tests successfully (I tested twice and did a fresh compile on a fresh branch and tested again and it's OK, and it works for SirVer as well), so the boost problem you're having must be a different problem. Your test explicitly fails, our test just hangs. -- https://code.l

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

2015-02-09 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/translator-credits into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/translator-credits/+merge/249085 The point of this branch is

<    1   2   3   4   5   6   7   8   9   10   >