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

2016-01-08 Thread SirVer
> I like the idea of adding a special loading screen when Widelands is first > run - e.g. the text could read "Optimizing Widelands images for first usage" > or some such, so the user will know that they won't have to wait for this in > the future. I'll look into that. I think that should be po

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

2016-01-09 Thread SirVer
[franku's concern about need for this change] I play Widelands in fullscreen at 3440 x 1440. At that resolution, the game needs 90% of the single CPU it uses just to draw the screen. I want to add zooming in and out into Widelands, but that needs that performance even worse. On my wifes computer

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

2016-01-09 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/use_image_cache into lp:widelands with lp:~widelands-dev/widelands/full_texture_atlas as a prerequisite. Commit message: - Build a texture atlas for the GPU that Widelands is using. The atlas is cached in ~/.widelands/cache for the

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

2016-01-09 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/use_image_cache into lp:widelands has been updated. Commit Message changed to: - Build a texture atlas for the GPU that Widelands is using. The atlas is cached in ~/.widelands/cache for the current build_id() and deleted and rebuild if the buil

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

2016-01-09 Thread SirVer
> @SirVer, what else do you want to introduce before b19? I think your changes > are last big changes before we enter the feature freeze. I have one more smaller refactoring out that I want to get in [1]. I wanted to build zooming into the game (that was, what got me started on the wh

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

2016-01-09 Thread SirVer
Diff comments: > > === modified file 'src/ui_basic/table.cc' > --- src/ui_basic/table.cc 2015-12-31 08:36:41 + > +++ src/ui_basic/table.cc 2016-01-06 12:13:29 + > @@ -365,8 +374,25 @@ > text_width = text_width + m_scrollbar->get_w(); >

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

2016-01-10 Thread SirVer
> As i understand, merging just this branch is only the preparation for > implementing the whole stuff and wouldn't change anything for now. So i am > fine with merging. The full implementation is https://code.launchpad.net/~widelands-dev/widelands/use_image_cache. It implements solution 1. Fo

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

2016-01-10 Thread SirVer
> This is an impressive improvement! Out of curiosity, how large does the > texture atlas end up being? All images fit into 16kx16k, but since most GPUs seem to support 8k we have 2 textures. This could be improved by doing what we started once before, but never finished: compactifying the anim

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

2016-01-10 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/split_overlay_manager into lp:~widelands-dev/widelands/render_queue has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/254496 -- Your t

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

2016-01-10 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/split_overlay_manager into lp:widelands. Commit message: - Split OverlayManager into FieldOverlayManager and EdgeOverlayManager. - They are both now owned by InteractiveBase instead of Map. - Removed caching of field-nodes calculation. This

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

2016-01-10 Thread SirVer
Review: Resubmit This is now ready for inclusion - I worked trunk into this branch again and I still think it is a good improvement and makes the code slightly better. This is the last non-bug fixing branch I want to get in before b19. -- https://code.launchpad.net/~widelands-dev/widelands/s

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

2016-01-10 Thread SirVer
Review: Approve > Checking the return value seems to solve the problem. Any idea why that should fix it? one nit, otherwise lgtm. Diff comments: > === modified file 'src/io/filesystem/disk_filesystem.cc' > --- src/io/filesystem/disk_filesystem.cc 2015-01-22 18:14:06 + > +++ src/io/fil

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

2016-01-10 Thread SirVer
Also, please set a commit message. -- https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ Mailing list:

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian

2016-01-10 Thread SirVer
The binary is gone again in https://code.launchpad.net/~widelands-dev/widelands/use_image_cache. It is hardly worth adding it in right now. wl_map_info is used on the server, it relies on it being in the PPA. It might also be useful for others, dunno. The other is purely debug, but does it hur

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

2016-01-10 Thread SirVer
Review: Resubmit Images in campaigns are fixed now. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing

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

2016-01-10 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/travis_clang into lp:widelands. Commit message: - Move travis build script into a bash file. Just simpler to read and modify than YML. - Adds travis config for building with clang 3.4, 3.5, 3.6 and 3.7 in Debug and Release. Requested

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

2016-01-10 Thread SirVer
Nicolai, could you outline what VRAM means in this case? I did not understand a lot of your last post, it is full of things that I have no understanding of. So far the only feedback I got is that this change improves the performance - I tested it on old macs too which has only integrated graphi

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

2016-01-11 Thread SirVer
works like a charm. gonna merge this as it only affects travis. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/travis_clang/+merge/282123 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis_clang into lp:wideland

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

2016-01-11 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/error_shadow into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 I introduced a couple of warnings in my recent

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

2016-01-11 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/error_shadow into lp:widelands has been updated. Commit Message changed to: Change -Wshadow into a compile error. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 -- Your team Widelands Devel

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

2016-01-11 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/error_shadow into lp:widelands has been updated. Commit Message changed to: Change -Wshadow into a compile error. Run with make -k on travis to get as many errors as possible from each failing run. For more details, see: https://code.launchpad.

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

2016-01-11 Thread SirVer
I will look into running with a minimal texture atlas through a commandline option and profile how much performance that cost on my system. Probably not before the weekend though. In the meantime, more testing with virtual machines would be great! -- https://code.launchpad.net/~widelands-dev/

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

2016-01-11 Thread SirVer
cool, thanks. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/282112 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/split_overlay_manager. ___ Mailing list: https:

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

2016-01-11 Thread SirVer
Great! merged and deployed. thanks :) kaputtnik, would you be willing and interested in learning how to deploy/merge on the server so that I am no longer the single point of failure? -- https://code.launchpad.net/~widelands-dev/widelands-website/copyrightyear_and_links/+merge/281450 Your team Wi

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

2016-01-12 Thread SirVer
took me forever to get around to this, but now it is merged!! thanks for doing this. I reworded some of the english on the legal notice page and fixed a bug (import of EMAIL_BACKEND) . -- https://code.launchpad.net/~franku/widelands-website/new_legal_notice_page/+merge/268973 Your team Wideland

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

2016-01-12 Thread SirVer
gcc 4.7 debug build just passed on travis. I think the rest will pass too now, so I am gonna merge this. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/error_sha

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian

2016-01-12 Thread SirVer
there have been complains about the PPA not being upgraded, so let's merge this in the meantime. I still think this should be in trunk if at all possible. is it? @bunnybot merge -- https://code.launchpad.net/~hjd/widelands/new-binary/+merge/282116 Your team Widelands Developers is requested to

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

2016-01-12 Thread SirVer
Adressed all comments and merged trunk. If everything passes on travis I'll merge this. Diff comments: > > === modified file 'src/graphic/make_texture_atlas_main.cc' > --- src/graphic/make_texture_atlas_main.cc2016-01-04 20:54:08 + > +++ src/graphic/make_texture_atlas_main.cc2016-0

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

2016-01-12 Thread SirVer
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/full_texture_atlas/+merge/281909 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~wide

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

2016-01-12 Thread SirVer
Review: Approve lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525395/+merge/282377 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525395. ___ Mailing list: https://launchpad

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

2016-01-12 Thread SirVer
I'll try to catch you in IRC in the next few days. There is no urgency here. -- https://code.launchpad.net/~widelands-dev/widelands-website/copyrightyear_and_links/+merge/281450 Your team Widelands Developers is subscribed to branch lp:widelands-website. _

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

2016-01-13 Thread SirVer
I need another round of testing, please. I modified the code to only pack terrains, roads and tribe borders and the pics/ subdirectory into a texture atlas and load all other graphics as needed from disk. This is what Nicolai requested - the code requires terrains and roads to be in the same t

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

2016-01-14 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #977980 in widelands: "Fish and mountain ressources cannot be removed when they are on grass&quo

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

2016-01-14 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands has been updated. Commit Message changed to: - Make mutating of field resources only possible through the map, no longer through the field interface. This allows the Map to decide if and which notification

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

2016-01-14 Thread SirVer
travis build was actually fine, just some flakyness with downloading debian packages. code lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1533183/+merge/282657 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widela

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

2016-01-14 Thread SirVer
I changed the code back to load an image from disk if it was not already loaded. That is the current behavior in trunk too. I just added logging to get a feeling how often that actually happens. I'll remove it before merging. nicolai, if you undo the last commit you have the originial behavior

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

2016-01-14 Thread SirVer
no. sorry, that explanation was confusing. It will immediately on start build a small one (~1024x1200 pixels) that contains frequently used images like the UI elements, buildhelp & the roads and world textures. Every other image will be loaded as needed from disk and put into a separate texture

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

2016-01-15 Thread SirVer
Thanks for testing! I changed the code to close all child windows in the editor and close all windows when the map changes. that also means when the map origin changes (because that changes the whole map). -- https://code.launchpad.net/~widelands-dev/widelands/fix_resource_overlay/+merge/282

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

2016-01-15 Thread SirVer
Review: Needs Fixing serial numbers of objects are not saved. There are MapObject[Saver|Loader] classes that remember at which position an object is saved into the file. On load, the serial numbers are restarted from zero. The correct way of doing map object serialization is by stealing from

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

2016-01-15 Thread SirVer
> Sorry, one crash after another... no need to apologize. I apologize for amateur-programming night tonight :/ next try. Could you take it for a spin? -- https://code.launchpad.net/~widelands-dev/widelands/fix_resource_overlay/+merge/282680 Your team Widelands Developers is subscribed to branch

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

2016-01-15 Thread SirVer
I agree :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/resource_water/+merge/282361 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/resource_water. ___ Mailing list: https://launchpad.net/~

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

2016-01-16 Thread SirVer
Next try. Tools were very differently coupled than uI, so that was a little more work. But I agree that it makes sense. Could you have another look? -- https://code.launchpad.net/~widelands-dev/widelands/fix_resource_overlay/+merge/282680 Your team Widelands Developers is subscribed to branch lp

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

2016-01-16 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/use_image_cache into lp:widelands has been updated. Commit Message changed to: - Build a texture atlas with the most commonly used images on startup. - Mild refactorings in the graphic initialization. - Add a caching mechanism to remember OpenGL

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

2016-01-16 Thread SirVer
Review: Resubmit Okay, I simplified the code as there is no need to cache the images anymore on disk - building the atlas is fast. I updated the commit message, merged trunk and removed codecheck warnings. Tibor, if you approve of the code, could you merge it in? -- https://code.launchpad.net/

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

2016-01-16 Thread SirVer
I fixed everything but 3. /src/editor/editorinteractive.cc:635:9: Warnung: Die Standardfallbehandlung in switch fehlt [-Wswitch-default] that is a stupid warning. I handled all possible cases in this switch() statement for the enum class it handles. The default: should never be taken, so it sh

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

2016-01-16 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/stricter_travis into lp:widelands has been updated. Commit Message changed to: - Change warnings around switches: GCC no longer complains if a switch has no default, clang complains if a switch that covers all cases has a default. - Run regress

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

2016-01-16 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/stricter_travis into lp:widelands. Commit message: - Change warnings around switches: GCC no longer complains if a switch has no default, clang complains if a switch that covers all cases has a default. - Run regression test on travis

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

2016-01-16 Thread SirVer
fullscreen and window will likely not make a huge difference. But the size of the widelands drawing area (i.e. resolution in game) and the amount of objects on it. The more different objects (terrains, roads, buildings, workers, critters and windows) the higher the difference in load. Also mak

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

2016-01-16 Thread SirVer
I think this is https://bugs.launchpad.net/widelands/+bug/1531114. I will look into that soonish. Can this branch go in? -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_te

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

2016-01-16 Thread SirVer
questions to testers: - does this fix iCCP: "known incorrect sRGB profile"? - does this break any images? -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/wide

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

2016-01-16 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/png_alternative_method into lp:widelands has been updated. Commit Message changed to: Run pngcrush pngcrush -ow -rem allb -reduce $file on all pngs in the repo. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/png_alter

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

2016-01-16 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/png_alternative_method into lp:widelands. Commit message: Run pngcrush pngcrush -ow -rem allb -reduce $file on all pngs in the repo. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1195724 in widelands

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

2016-01-17 Thread SirVer
Thanks for testing everybody! Thanks for reviewing, Tibor. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___

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

2016-01-17 Thread SirVer
Review: Resubmit This grew a bit and needs another look. -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ Maili

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

2016-01-17 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/stricter_travis into lp:widelands has been updated. Commit Message changed to: - Change warnings around switches: GCC no longer complains if a switch has no default, clang complains if a switch that covers all cases has a default. - Introduces a

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

2016-01-17 Thread SirVer
It also fixed a real bug (removes wrong assert). -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ Mailing list:

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

2016-01-17 Thread SirVer
add a log("## %s", filename.c_str()) in load_image() in image_io I guess. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method int

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

2016-01-17 Thread SirVer
kaputtnik, as always thanks for testing :) Tino, did you find a way to find the images with broken profile? If so, we could revert this branch and only fix the ones that are broken - this would not make this such a huge change for little gain (the size of most PNGs is < 1 block anyways, so shri

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

2016-01-17 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands. Commit message: - Fix transparency issues with representative_image(). - Refactor RenderTarget::drawanim(rect) into blit_animation and make RenderTarget no longer depend on logic/ code

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

2016-01-17 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 Fix deprecated use of implicit

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

2016-01-17 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/fix_zip_filesystem into lp:widelands has been updated. Commit Message changed to: Use std::shared_ptr to properly share zip files between classes. ZipFilesystem, any child filesystems created by make_sub_file_system, and any ZipStream[Write|Rea

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

2016-01-17 Thread SirVer
Testers: This should be a refactoring only to make sure we are not broken by c++14 (which deprecates our inproper use of Copy construction in this case). No noticeable changes in behavior. -- https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 Your team Widelands

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

2016-01-17 Thread SirVer
> In favor of reverting the branch, i would just correct them by hand with gimp > :-) The problem is that we do not have a bullet proof way of figuring out which ones are broken. Do you know one? If so, go for it and fix the PNGs and we can drop this branch. > We should consider to remove ima

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

2016-01-18 Thread SirVer
Review: Approve Tested and works for me. A much better solution than changing all pictures. Could you add to the commit message the process how you found out that these are the ones that are troublesome and how you fixed them? I guess we'll need to repeat this eventually again (when we have new

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

2016-01-18 Thread SirVer
Review: Disapprove Superseded by https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wideland

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

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

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

2016-01-18 Thread SirVer
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_zip_filesystem/+merge/282884 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_zip_filesystem. ___ Mailing list: https://launchpad.

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

2016-01-18 Thread SirVer
I found the crash and fixed it in 7711. Thanks! > I also notice that this branch is slower than trunk, scrolling isn't as > smooth. I cannot repro this - OpenGL calls and CPU load is exactly the same as trunk for me. Could you doublecheck and quantify this? -- https://code.launchpad.net/~widel

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

2016-01-18 Thread SirVer
Two approves should be enough for everybody :) kaputtnik, just in case you did not know, you can also merge. Everybody can! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widel

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

2016-01-18 Thread SirVer
this fixes bug 1302565. -- https://code.launchpad.net/~widelands-dev/widelands/screenshot_from_backbuffer/+merge/283043 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands. __

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

2016-01-18 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands has been updated. Commit Message changed to: - Write screenshot before swapping data into the backbuffer. Before this change, we used glReadPixels() which always reads the backbuffer, i.e. the last f

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

2016-01-18 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/screenshot_from_backbuffer into lp:widelands. Commit message: - Write screenshot before swapping data into the backbuffer. Before this change, we used glReadPixels() which always reads the backbuffer, i.e. the last frame. Now we force a

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

2016-01-19 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/resize_texture_cache into lp:widelands. Commit message: - Resize texture cache to 30 MB. - Simplify texture cache: It only deals with transient surfaces and uses less virtual functions and no pointers. Fixes bug 1121944. Requested

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2016-01-19 Thread SirVer
I suggest closing this as we are running the regression test now for each merge proposal on travis via bunnybot. Do you agree, hjd? -- https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/t

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

2016-01-20 Thread SirVer
Not really you can click around a lot in the Map select dialogue, this will exercise the code - the cache will overflow and items will get dropped and put back in. -- https://code.launchpad.net/~widelands-dev/widelands/resize_texture_cache/+merge/283048 Your team Widelands Developers is req

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

2016-01-20 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/disable_gl_depth into lp:widelands. Commit message: Disable GL_DEPTH testing for most operations and only enable it temporarily when everything is drawn onto the screen. Historically, WIdelands always implicitly defined the z-ordering by

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

2016-01-20 Thread SirVer
thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/screenshot_from_backbuffer/+merge/283043 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/screenshot_from_backbuffer. ___ Mailing list: h

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

2016-01-20 Thread SirVer
Thanks for testing and the review. Let's see if that fixes the Windows problem before merging it in. -- https://code.launchpad.net/~widelands-dev/widelands/disable_gl_depth/+merge/283353 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/disable_gl_depth. ___

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

2016-01-20 Thread SirVer
Really great work! That was not easy, but I think this design fits much better into the existing code. I think that reads much better than before. Last comment is about dealing with ship names. I suggest dealing with the string sets directly instead of indices into an array. Diff comments: >

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

2016-01-20 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/rotate_terrains into lp:widelands. Commit message: Fixes an error in converting from pixel space to opengl space which flipped all textures vertically when drawn on screen. Requested reviews: Widelands Developers (widelands-dev

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

2016-01-21 Thread SirVer
Thanks, Tibor! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/resize_texture_cache/+merge/283048 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/resize_texture_cache. ___ Mailing list: https:/

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

2016-01-21 Thread SirVer
answer inline. Sorry, the original comment by me was not particularly understandable :/ Diff comments: > > === modified file 'src/ai/defaultai.h' > --- src/ai/defaultai.h2016-01-06 19:11:20 + > +++ src/ai/defaultai.h2016-01-20 20:12:20 + > @@ -348,13 +349,16 @@ > u

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

2016-01-21 Thread SirVer
Added a comment. Thanks for testing and code review! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/rotate_terrains/+merge/283389 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rotate_terrains. ___

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

2016-01-21 Thread SirVer
I do not see the sound files in the diff below. Did you bzr add them? And where did you get the sound files from, did you make them yourself? I am asking for licensing reasons. -- https://code.launchpad.net/~widelands-dev/widelands/cricket_frog_sounds/+merge/283511 Your team Widelands Developers

[Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2016-01-21 Thread SirVer
The proposal to merge lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 -- Your team Widelands Developers is requested to review the

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2016-01-21 Thread SirVer
I went ahead and put the current debian/ directory into trunk, so that we have an easier time keeping it up to date with changes to the codebase. I also deleted recipes and PPA for precise, which have not been build for > 1 year. I adapted the recipe for widelands-daily to no longer merge the de

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

2016-01-21 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/copyright-file into lp:~widelands-dev/widelands/debian has been updated. Status: Work in progress => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/245297 -- Your team Widelands De

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

2016-01-21 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/copyright-file into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) GunChleoc (gunchleoc) Martin Quinson (mquinson) Related bugs: Bug #1404539 in widelands: "Update Debian packaging copyright file wit

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

2016-01-21 Thread SirVer
With b19 getting closer it is probably time to revisit this branch and get it in. -- https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/283575 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/copyright-file into lp:wid

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

2016-01-22 Thread SirVer
Let's get it in then. It might fix some issues, since it is more correct than before (actually disabling depth testing when we are ignoring depth and only enable it when we are actually depending on it). Thanks for testing & code review. @bunnybot merge -- https://code.launchpad.net/~widela

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

2016-01-22 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/memory_leak into lp:widelands. Commit message: Fix memory leak and extra work in UI::Table::draw. On each frame we created a downscaled texture if the image of a table entry was too small and leaked this texture immediately. This extra

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

2016-01-22 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/memory_leak into lp:widelands has been updated. Commit Message changed to: - Fix big memory leak and extra work in UI::Table::draw. - Fix a couple of minor memory leaks around the code I found using the Leaks tool in Apple's Instruments. On eac

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

2016-01-22 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/memory_leak into lp:widelands has been updated. Commit Message changed to: - Fix big memory leak and extra work in UI::Table::draw. - Fix a couple of minor memory leaks around the code I found using the Leaks tool in Apple's Instruments. Major

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

2016-01-22 Thread SirVer
> Have you tested that this doesn't regress > https://bugs.launchpad.net/widelands/+bug/1522564? No, I did not. It very likely regresses that as blitrect_scale does not change the source rect when cropping. I'll look into that, but I'd like to get https://code.launchpad.net/~widelands-dev/widel

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

2016-01-22 Thread SirVer
Review: Approve very good! Only a couple of nits. Please set a commit message (further up on this page) before letting bunnybot merge this. Diff comments: > > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2016-01-06 19:11:20 + > +++ src/ai/defaultai.cc 2

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

2016-01-22 Thread SirVer
Not tested either, but seems save enough. Thanks for that! We haven't added enough to make Widelands more immersive and sounds like these help a lot. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/cricket_frog_sounds/+merge/283511 Your team Widelands Developers is subs

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

2016-01-23 Thread SirVer
Okay. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ Mailing list: https://launchpad.net/~wid

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

2016-01-23 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/memory_leak into lp:widelands has been updated. Commit Message changed to: - Fix big memory leak and extra work in UI::Table::draw. - Fix a couple of minor memory leaks around the code I found using the Leaks tool in Apple's Instruments. - Corre

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

2016-01-23 Thread SirVer
> I get increasing memory for about 30-100k per second. Does this ever stop or grow boundless? I just pushed a commit that should fix bug 1522564 too. This is ready for code review and another round of testing. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Yo

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

2016-01-23 Thread SirVer
Naaa, what cam Possibly go wrong :) Yolo @bunnybot merge > Am 23.01.2016 um 20:42 schrieb TiborB : > > OK, all incorporated. Will we wait for Travis build status? > -- > https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 > You are reviewing the proposed merg

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