[Widelands-dev] Bunnybot says...

2016-01-16 Thread bunnybot
Travis build 285 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/102874396. -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_tra

[Widelands-dev] Bunnybot says...

2016-01-16 Thread bunnybot
Travis build 284 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/102860052. -- 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:~wideland

[Widelands-dev] Bunnybot says...

2016-01-16 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/stricter_travis mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_stricter_travis You can give me commands by starting a line with @bunnybot . I

[Widelands-dev] Bunnybot says...

2016-01-16 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/png_alternative_method mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_png_alternative_method You can give me commands by starting a line with @

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

2016-01-16 Thread GunChleoc
Looks like my bug is https://bugs.launchpad.net/widelands/+bug/1531114 indeed - seems more pronounced with small screen resolutions maybe? I won't have time to look at the code until end of next week, but if everything has been checked, it can go in. -- https://code.launchpad.net/~widelands-dev

[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: "Warni

[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

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] Bunnybot says...

2016-01-16 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'git fetch _widelands_dev_widelands_stricter_travis' failed. Output: progress revision 100 'master' (100/7709) progress revision 200 'master' (200/7709) progress revision 300 'master' (300/7709) progress revision 400 'mas

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

2016-01-16 Thread TiborB
Review: Approve I am all for merging it. -- 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 list: htt

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

2016-01-16 Thread TiborB
I have the same problem as GunChleoc - though I did not notice it. Otherwise, it works nicely -- 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/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/stricter_travis into lp:widelands

2016-01-16 Thread GunChleoc
Review: Approve LGTM -- 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/~wide

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

2016-01-16 Thread GunChleoc
I gave this a quick spin in my VM and it runs fine. There is a problem with drawing rectangles though - got probably introduced in one of the previous graphics branches. https://launchpadlibrarian.net/234364565/rectangles.png -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cach

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 kaputtnik
Is there a great difference between fullscreen and window mode? I used windowed mode to have the task manager open to see the CPU usage. I just tested a little game on my laptop and this branch as current trunk uses about 12% CPU... So no difference? -- https://code.launchpad.net/~widelands-de

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

[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

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

2016-01-16 Thread kaputtnik
3 is better than 2 :-) May we should make an appointment so that SirVer not have to tell things twice. -- 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:~franku/widelands-website/new_legal_notice_page into lp:widelands-website

2016-01-16 Thread kaputtnik
Shall i add the corrections to the current merge proposal? -- https://code.launchpad.net/~franku/widelands-website/new_legal_notice_page/+merge/268973 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https:/

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

2016-01-16 Thread GunChleoc
Fine by me, thanks for explaining. -- https://code.launchpad.net/~widelands-dev/widelands/fix_resource_overlay/+merge/282680 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_resource_overlay. ___ Mailing list: http

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

2016-01-16 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_resource_overlay/+merge/282680 -- Your team Widelands Developers is subscr

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

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

2016-01-16 Thread GunChleoc
I'm online today, so I can do some testing. -- 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 list: ht

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

2016-01-16 Thread GunChleoc
Review: Approve Code LGTM, just 1 code style nit. I noticed that you use variable type "auto" a lot - please double-check if you can be more specific. Strong typing is good ;) Diff comments: > > === modified file 'src/editor/editorinteractive.h' > --- src/editor/editorinteractive.h2016-0

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/

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

2016-01-16 Thread GunChleoc
Code LGTM - just one small nit. Not tested. Diff comments: > > === modified file 'templates/wiki/edit.html' > --- templates/wiki/edit.html 2015-04-01 20:01:41 + > +++ templates/wiki/edit.html 2016-01-14 19:36:43 + > @@ -117,14 +117,24 @@ > >

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

2016-01-16 Thread GunChleoc
I think it would be good to have a team of 3 - so if any of us breaks it, there would be 2 people around to help. I need to get around to making my test installation work. -- https://code.launchpad.net/~widelands-dev/widelands-website/copyrightyear_and_links/+merge/281450 Your team Widelands Dev

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

2016-01-16 Thread GunChleoc
Some proofreading - sorry I didn't see this before. There are no financial goal or interest. => There is no financial goal or interest. It is customary to use Title Case in English: Project lead => Project Lead There are several possibilities to get in contact. For questions about the game or

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

2016-01-16 Thread GunChleoc
LGTM:) If somebody touches this code again in the future, correct English is "dug_percentage" ;) It can of course stay the way it is for now! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525395/+merge/282377 Your team Widelands Developers is subscribed to branch lp:~widelands-de

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

2016-01-16 Thread GunChleoc
Review: Approve New code still LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/error_shadow. ___ Mailing list: https://launchp

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

2016-01-16 Thread kaputtnik
Review: Approve correct functionality Looks very good now :-) There are some compiler statements/warnings. Because i am not sure to which code they belong, or if they are importand, i write them down here: 1. /src/editor/editorinteractive.cc:134: No space after opening brace allowed! 2. /src/ed

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

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

2016-01-16 Thread kaputtnik
Works now... until one thing related to bug 1521736 : Loading another map or create a new map does not reset tool size and former chosen resources or terrain are still used. If you have enabled the info tool and load/create another map the pointer is still the info tool. I would expect that loa