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

2014-11-20 Thread SirVer
Review: Approve Makes sense. lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1392406/+merge/241727 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1392406. ___ Mailing list: https://launchpad.net

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

2014-11-21 Thread SirVer
I am going to merge this now. -- https://code.launchpad.net/~widelands-dev/widelands/reducing-paths/+merge/239645 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/reducing-paths. ___ Mailing list: https://launchpad.net

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

2014-11-22 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_caching_in_ui into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_caching_in_ui/+merge/242559 In preparation of removing the

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

2014-11-22 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_alt_panning_of_window into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_alt_panning_of_window/+merge/242560 Removes alt

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

2014-11-22 Thread SirVer
Review: Needs Fixing That is not a proper fix. Assume this order of action: - you set 10 fish on water. - you switch the terrain to be greenland. Now you have 10 fish on greenland and the map is broken. - you now click the reduce resource tool -> you now have 9 fish on water, but that is still

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

2014-11-22 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/ui_fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ui_fixes/+merge/242561 - Uses SDLK_ (logical keycodes) instead of

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

2014-11-22 Thread SirVer
valid comment, however we have to deal with this in another fashion anyways. Tablets do not have an ALT key. -- https://code.launchpad.net/~widelands-dev/widelands/remove_alt_panning_of_window/+merge/242560 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands

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

2014-11-22 Thread SirVer
1. remerged trunk and fixed all conflicts. 2. that is probably an issue with the window manager. It works for me. I think we should rethink the alternate tools (maybe left/right mouse buttons). going to merge. -- https://code.launchpad.net/~widelands-dev/widelands/ui_fixes/+merge/242561 Your te

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

2014-11-22 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/save_minimap into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/save_minimap/+merge/242567 Saves a minimap into the folder of the map

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

2014-11-23 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/remove_software_rendering into lp:widelands has been updated. Description changed to: For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_software_rendering/+merge/242587 -- Your team Widelands Developers is reque

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

2014-11-23 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_software_rendering into lp:widelands. Commit message: - Removes software renderering. - Moves code from GLSurface into Surface. GLSurface is gone now. - Changes stand alone richtext renderer to bring up a graphics system so that

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

2014-11-23 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/remove_software_rendering into lp:widelands has been updated. Description changed to: For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_software_rendering/+merge/242587 -- Your team Widelands Developers is req

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

2014-11-23 Thread SirVer
Diff comments: > === modified file 'src/graphic/CMakeLists.txt' > --- src/graphic/CMakeLists.txt2014-11-08 14:59:03 + > +++ src/graphic/CMakeLists.txt2014-11-23 10:15:33 + > @@ -36,21 +36,22 @@ > graphic_surface > ) > > +wl_library(graphic_sdl_utils > + SRCS > +

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

2014-11-23 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/fix_some_resizing_bugs into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #536500 in widelands: "Can not toggle fullscreen with Alt+Enter or resize with w.m." https://bugs.lau

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

2014-11-23 Thread SirVer
- Removes the fallback settings. Now, switching to fullscreen should always give you a stable mode to work with (the one your system is already running). -- https://code.launchpad.net/~widelands-dev/widelands/fix_some_resizing_bugs/+merge/242593 Your team Widelands Developers is requested to revi

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

2014-11-23 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/move_road_texture_out_of_graphics into lp:widelands with lp:~widelands-dev/widelands/fix_some_resizing_bugs as a prerequisite. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

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

2014-11-25 Thread SirVer
Review: Needs Fixing I went over everything outside of src/ and over src/base which contains the meat of the design changes you did. I had quite a lot of comments and let you get your head down until your happy with what you have again :) -- https://code.launchpad.net/~widelands-dev/widelands/f

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

2014-11-25 Thread SirVer
Could you add a test in test/maps/lua_testsuite.wmf/scripting/efield.lua and make sure that it did not pass before and passes after your fix? You can run the tests with ./regression_test.py -b ../build/debug/src/widelands -r lua_testsuite -- https://code.launchpad.net/~widelands-dev/wideland

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

2014-11-26 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/cleanup_geometry into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/cleanup_geometry/+merge/242888 Suggested commit message: Cleaned up

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

2014-11-26 Thread SirVer
I filed bug 1396756 for this with my thoughts on the topic. I think discussion should continue there. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_geometry/+merge/242888 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cleanup_geometry. __

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

2014-11-27 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/texture_atlas into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119 Suggested commit message: - Adds a

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

2014-11-27 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/use_sdl_image_in_one_place into lp:widelands with lp:~widelands-dev/widelands/texture_atlas as a prerequisite. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev

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

2014-11-28 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/cleanup_game_renderer into lp:widelands with lp:~widelands-dev/widelands/use_sdl_image_in_one_place as a prerequisite. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands

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

2014-11-28 Thread SirVer
Review: Resubmit I added the algorithm include. It is needed for std::sort according to the documentation and was missing in other files too. The other points you mention are unlikely to be caused by this change, so I'd rather not block on it. Could you verify that they are in trunk already an

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

2014-11-29 Thread SirVer
Review: Needs Fixing Inline comments as I am on a slow internet connection. 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 + >

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

2014-11-29 Thread SirVer
Review: Approve LGTM, a couple of nits. Could you fix them. Also starting_res_amount is a bit cumbersome. What do you guys think of renaming it to initial_resource_amount throughout the codebase (i.e. also in cpp?). Diff comments: > === modified file 'src/scripting/lua_map.cc' > --- src/scrip

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

2014-11-29 Thread SirVer
They do not come up with clang. Could you fix them in trunk? Can this be merged then? I think all comments are sorted out. > Am 29.11.2014 um 10:32 schrieb GunChleoc : > > I just noticed that the compiler warnings come up on trunk as well, so > they're not caused by this particular branch. >

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

2014-11-29 Thread SirVer
uctionSite const, constructionsite, &b); > + BuildingObserver& target_bo = > + > get_building_observer(constructionsite->building().name().c_str()); > --target_bo.cnt_under_construction_; > --num_construction

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

2014-11-30 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/f_for_fullscreen into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #682351 in widelands: "wishlist: Fullscreen toogle also in Menu" https://bugs.launchpad.net/widelands/+bug/682351

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

2014-11-30 Thread SirVer
Review: Approve Excellent! Thanks for fixing. Diff comments: > === modified file 'src/graphic/graphic.cc' > --- src/graphic/graphic.cc2014-11-24 07:10:03 + > +++ src/graphic/graphic.cc2014-11-30 10:00:23 + > @@ -300,7 +300,7 @@ > * @param sw a StreamWrite where the png is writt

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

2014-11-30 Thread SirVer
Oh, I had some inline comments, please consider them before merging. -- https://code.launchpad.net/~widelands-dev/widelands/fix_screenshots/+merge/243225 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_screenshots. __

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

2014-11-30 Thread SirVer
I'd rather have a code review than having this in quickly. So take your time :). -- 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/bug-1219914 into lp:widelands

2014-11-30 Thread SirVer
http://www.peterbe.com/plog/set-ex -- 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] [Merge] lp:~widelands-dev/widelands/move_mapview_children into lp:widelands

2014-11-30 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/move_mapview_children into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1397302 in widelands: "Fullscreen Toggle Text Overlay" https://bugs.launchpad.net/widelands/+bug/1397302

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

2014-11-30 Thread SirVer
Do the rename here I'd say. > I dont understand a meaning of this comment. Why should we care that > resource_amount!=starting_resource_amount here. In fact they will probably be > equal. Depending on a map used for testing. I would then suggest that you test one more value and also test the ab

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

2014-11-30 Thread SirVer
I think you are both describing the known issue. This is more work that I am willing to invest into this right now. I would need help to do this in this branch. Otherwise I'd rather merge it and open a new bug. -- https://code.launchpad.net/~widelands-dev/widelands/f_for_fullscreen/+merge/24322

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

2014-11-30 Thread SirVer
I like core and base. I like base the most, but we already have a base/. however, nothing stops use from using base/ui base/graphic and so on and just keep the current base directories in base/ -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_game_renderer/+merge/243124 Your team W

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

2014-11-30 Thread SirVer
Review: Resubmit Addressed all comments and merged trunk. 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 @@ > frameti

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

2014-11-30 Thread SirVer
Review: Approve Looks good. Gonna merge. -- https://code.launchpad.net/~widelands-dev/widelands/delete_deprecated/+merge/243174 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/delete_deprecated. ___ Mailing list: htt

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

2014-11-30 Thread SirVer
> so should I remove :see also: :attr:`resource` I thought it would not work. Could you doublecheck that the current occurences are working in https://wl.widelands.org/docs/wl/ ? If so, then leave it in. If not, please take it out. -- https://code.launchpad.net/~widelands-dev/widelands/bug-128

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

2014-11-30 Thread SirVer
Review: Resubmit -- 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.net

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

2014-11-30 Thread SirVer
Very reasonable suggestion. Done. -- https://code.launchpad.net/~widelands-dev/widelands/use_sdl_image_in_one_place/+merge/243120 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/use_sdl_image_in_one_place into lp:widelands.

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

2014-12-01 Thread SirVer
great. only the rename from starting_ to initial_ and this is good to go. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1281823.

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

2014-12-01 Thread SirVer
Review: Approve lgtm. lots of deletes which always means simpler code :) -- https://code.launchpad.net/~hjd/widelands/use-bundled-fonts/+merge/243323 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/debian. ___ Mailin

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

2014-12-01 Thread SirVer
other branch, definitively. this change already got bigger than i wanted it to be and I also want to ships this asap. -- 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:~widelan

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

2014-12-01 Thread SirVer
What you are suggesting is the status quo (just refactored). I set out to solve the particular use case mentioned in bug 682351, mainly that you need to start a game to leave fullscreen. This use case is supported now, you can exit fullscreen, look something up and then enter fullscreen again an

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

2014-12-01 Thread SirVer
Review: Needs Fixing 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-12-01 09:36:12 + > @@ -0,0 +1,61 @@ > +## This script will fix translati

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

2014-12-01 Thread SirVer
Review: Needs Fixing You missed some :). See inline comments. Diff comments: > === modified file 'src/editor/map_generator.cc' > --- src/editor/map_generator.cc 2014-09-20 09:37:47 + > +++ src/editor/map_generator.cc 2014-12-01 21:50:51 + > @@ -138,7 +138,7 @@ >

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

2014-12-01 Thread SirVer
Review: Needs Fixing Okay, next round :). I think this converges.. > Time for the next round. FontSet now has its own class and parses itself. The > singleton is gone - > FontHandler1 now does the job. That is much better. But the singleton is still raining on our parade with the stand alone r

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

2014-12-02 Thread SirVer
Say, Tibor, are you having fun working on Widelands? You seem unhappy in most of your comments about procedure, overhead or comments. -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is requested to review the proposed merge of lp:

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

2014-12-03 Thread SirVer
Review: Approve You missed one rename :). I did it for you and merged. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1281823. ___

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

2014-12-03 Thread SirVer
Review: Needs Fixing Spoke to early. The fix is flawed - it also changes initial_res_amount in a game. That leads to wrong results if a scenario changes a fields resource amount. I added a failing test. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1281823/+merge/242837 Your team W

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

2014-12-03 Thread SirVer
Merged and filed bug 1398733. -- 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. ___ Mailing list: https://launchpad

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

2014-12-03 Thread SirVer
I think you can maximize the fun by making smaller branches. They are faster to merge, clean and review. -- 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/seafa

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

2014-12-03 Thread SirVer
No, in the editor it is correct to always change the initial_res_amount too - there is no difference between the too there. And in game you should never touch that. What happens when amount > initial_amount I do not know but there is no reason to change the value if the scripter wants exactly th

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

2014-12-03 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_cached_resizing into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_cached_resizing/+merge/243584 Suggested commit message

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

2014-12-03 Thread SirVer
Review: Needs Fixing I added a bunch of NOCOM(#codereview) comments in the code. I disagree with the has_warehouse method. Also you added a bunch of method declarations in lua_bases.h, but did not implement these - I removed them, but that was sloppy. Do you look over the diff when you send s

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

2014-12-03 Thread SirVer
Review: Approve Looks good now. Merged. > "What happens when amount > initial_amount" - I dont think is it good aproach > to allow such situation and in addition, there is no set_initial_res_amount > available via LUA - but I will change it, no problem... I understand what you say. If a script

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

2014-12-03 Thread SirVer
Review: Approve looks good. merged. -- https://code.launchpad.net/~widelands-dev/widelands/bug-859245/+merge/241549 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-859245. ___ Mailing list: https://launchpad.net/

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

2014-12-04 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_gray into lp:widelands with lp:~widelands-dev/widelands/remove_cached_resizing 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-1380286 into lp:widelands

2014-12-04 Thread SirVer
> Do you really want to reimplement all that is available in C to lua? No, only what makes sense. Asking a flag if it knows about a warehouse somewhere in its road network makes no sense to me. Option 1) is clearer, but it is also more work. I would suggest removing get_warehouse from this br

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

2014-12-04 Thread SirVer
Thanks for the review and the fixes. :) > I love these graphic changes, Widelands is now noticeably faster on my > machine. Great, that keeps me motivated. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_game_renderer/+merge/243124 Your team Widelands Developers is subscribed

Re: [Widelands-dev] [Merge] lp:~willyscheibel/widelands/use-glbinding into lp:widelands

2014-12-04 Thread SirVer
Willy, welcome to Widelands and thanks for your contribution! Could you elaborate a bit what motivated this change? I am a big fan of glbinding myself, I did not move away from GLEW so far because there was no absolute need and it is well supported on all platforms (including mobile, i.e. andro

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

2014-12-04 Thread SirVer
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/codecheck_sort/+merge/243651 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/codecheck_sort. ___ Mailing list: https://launchpad.net/~widel

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/remove-sdl2-gfx into lp:~widelands-dev/widelands/debian

2014-12-04 Thread SirVer
Review: Approve should be save to merge. sdl_gfx is definitively no longer used. -- https://code.launchpad.net/~hjd/widelands/remove-sdl2-gfx/+merge/243727 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/debian. ___

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

2014-12-04 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/remove_gray into lp:widelands has been updated. Description changed to: Suggested commit message: - Removes all uses of ImageTransformation::change_luminosity and ::gray_out. This needed some refactoring in how blits are done. For more details

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

2014-12-06 Thread SirVer
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 independent. Do you think

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

2014-12-06 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_player_color into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_player_color/+merge/243896 - Renamed GrayBlitProgram to

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

2014-12-07 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_in_memory_image into lp:widelands with lp:~widelands-dev/widelands/remove_player_color as a prerequisite. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev

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

2014-12-07 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/move_drawing_out into lp:widelands with lp:~widelands-dev/widelands/remove_in_memory_image as a prerequisite. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev

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

2014-12-07 Thread SirVer
Review: Approve couple of nits to consider. Diff comments: > === modified file 'src/ui_fsmenu/campaign_select.cc' > --- src/ui_fsmenu/campaign_select.cc 2014-10-31 07:40:54 + > +++ src/ui_fsmenu/campaign_select.cc 2014-12-07 10:33:42 + > @@ -233,11 +233,14 @@ > Ca

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

2014-12-07 Thread SirVer
Review: Approve > pushd is still an unknown command. How do you run the script? If you mark it executable (chmod 755 script.sh) and run it as ./utils/script.sh it should work. But it is fine to merge this as is I'd say. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1219914/+merg

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

2014-12-08 Thread SirVer
Yes please. > Am 08.12.2014 um 12:15 schrieb 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/widel

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

2014-12-09 Thread SirVer
Review: Needs Fixing The crash in the stand alone renderer is still there. I added more context in the file. -- 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-09 Thread SirVer
Pushed now. Sorry, I tried on the train and it seems like the internet was not good enough. This is the crashing command line for me, I run it from the bzr root. ./build/debug/src/graphic/text/test/wl_render_richtext 373 blub.png src/graphic/text/test/data/sub_fixedwidth_floatright/input00.txt

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

2014-12-09 Thread SirVer
Review: Approve not as much simplified as I hoped through pushd/popd, but I think it still is better. Ship it! -- 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/fonts into lp:widelands

2014-12-10 Thread SirVer
Are you saying that this command line: ./build/debug/src/graphic/text/test/wl_render_richtext 373 blub.png src/graphic/text/test/data/sub_fixedwidth_floatright/input00.txt is not crashing for you? Is it outputting an image blub.png that looks like the one in src/graphic/text/test/data/sub_fixe

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

2014-12-10 Thread SirVer
> Should we check for g_fs->file_exists here? No. We expect the images that are loaded here to be there and load_image will throw an error if they are not. If the callsite assumes that the picture is not there, it can catch the error and recover. > Why not just return image.get() and do away w

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

2014-12-10 Thread SirVer
Thanks for the review! gonna merge. -- https://code.launchpad.net/~widelands-dev/widelands/remove_in_memory_image/+merge/243911 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_player_color. ___ Mailing list: ht

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

2014-12-10 Thread SirVer
No, the stand alone test its only using the new text renderer. But it is not created in the test as it is a new global dependency. You need to create it or - even better - do not depend on it in the rich text renderer. You could do that by injecting a fontset into it on construction. > Am 10.

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

2014-12-12 Thread SirVer
Review: Approve LGTM. A very clear technical KO in round 4, I'd say. Congrats :) I pushed two more commits with small nits that I found during review. Please have a look if you are fine with everything before merging. -- https://code.launchpad.net/~widelands-dev/widelands/fonts/+merge/238608 Y

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/clang-for-ai-files into lp:widelands

2014-12-12 Thread SirVer
Review: Approve looks good. Will make the other diff easier to read once this is merged. -- https://code.launchpad.net/~widelands-dev/widelands/clang-for-ai-files/+merge/244508 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/clang-for-ai-files. ___

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

2014-12-14 Thread SirVer
Review: Resubmit Merged trunk and fixed a crash. -- https://code.launchpad.net/~widelands-dev/widelands/move_drawing_out/+merge/243944 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_in_memory_image. ___ Maili

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

2014-12-20 Thread SirVer
Go ahead, but best open a bug for the font licensens so we will not forget. -- https://code.launchpad.net/~hjd/widelands/use-bundled-fonts/+merge/243323 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/debian. ___ Mail

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

2014-12-20 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/cleanup_mixer_init into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1226137 in widelands: "Check for ogg support in SDL_mixer and show warning" https://bugs.launchpad.net/wide

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

2014-12-20 Thread SirVer
I think this is a definitive improvement to the readability. I did not carefully review this yet though, I think the seafaring branch should be merged first. -- https://code.launchpad.net/~widelands-dev/widelands/ai_remove_iterators/+merge/243894 Your team Widelands Developers is requested to re

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

2014-12-20 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/find_attack_soldiers into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276 This patch was send to me by

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

2014-12-20 Thread SirVer
> Just note that this is based on seafaring-ai branch. So if you merge this... My bad. Fixed by rebasing on trunk and push --overwriting. -- https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276 Your team Widelands Developers is requested to review the proposed m

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

2014-12-27 Thread SirVer
I take this as an approve and go ahead and merge this. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup_mixer_init/+merge/245266 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cleanup_mixer_init into lp:widelands. __

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/added-css-link-classes into lp:widelands-website

2014-12-27 Thread SirVer
Review: Approve Great, now in merge requests!! Yay! Merged and deployed. -- https://code.launchpad.net/~franku/widelands-website/added-css-link-classes/+merge/245346 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mail

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

2014-12-28 Thread SirVer
Review: Approve Ship it! :) -- https://code.launchpad.net/~widelands-dev/widelands/refactor_editor_start/+merge/245412 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/refactor_editor_start. ___ Mailing list: https://

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/smiley-and-codeblock-enhancements into lp:widelands-website

2015-01-08 Thread SirVer
Review: Needs Fixing > Is there a better way? A hint on that is welcome :-) printf debugging is what I use most of the times too - pdb is not a great debugger. however I have a snippet in my editor that will format all lines I output like so: print "#sirver: a: %s" % a. Simila

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

2015-01-08 Thread SirVer
I think these tests should be done for all players - what you describe can happen for a human player too if he presses the same button twice while the command is still distributed to other players in the game. Can easily happen in slow network games. Your code saveguards against that and should

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/smiley-and-codeblock-enhancements into lp:widelands-website

2015-01-11 Thread SirVer
Review: Approve Merged and deployed. Thanks! -- https://code.launchpad.net/~franku/widelands-website/smiley-and-codeblock-enhancements/+merge/245742 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://

Re: [Widelands-dev] [Merge] lp:~shevonar/widelands-website/django1.4 into lp:widelands-website

2015-01-11 Thread SirVer
> SirVer: Btw, what sort of database do we use in production, which may affect > how to approach how we deal with the timezones and potential conversion of > the data? We use mysql on the server. > I think we need to push this more, because I fear we will run into problems >

Re: [Widelands-dev] [Merge] lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website

2015-01-11 Thread SirVer
I will test this on alpha.widelands.org first - as soon as I find some time. I'll ping here if that is up and running so we can test some more. -- https://code.launchpad.net/~hjd/widelands-website/django1.3.7/+merge/245447 Your team Widelands Developers is requested to review the proposed merge

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

2015-01-11 Thread SirVer
Review: Needs Fixing I did review the code and added a bunch of comments. I think there is one bug in there. > Allow setting of number of files (1-10) in advanced options dialog I do not think we want users to mess with these settings and having them tunable from the console is a reasonable ch

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

2015-01-11 Thread SirVer
> I'll like this more than a round robin style of saving, where you always have > to look which was the last one. I agree. I did not understand the code. > Will rework and implement a console option... Using the options (like you did) already adds a console option, it is just not listed in th

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

2015-01-13 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/rolling_autosave/+merge/246061 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rolling_autosave. ___ Mailing list: https://launchpad.net/~widela

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

2015-01-13 Thread SirVer
Looks good, going to merge. -- https://code.launchpad.net/~widelands-dev/widelands/rolling_autosave/+merge/246061 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rolling_autosave. ___ Mailing list: https://launchpad.n

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