Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands
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 loading another map would reset all input, just like it is when starting the editor. Seems to be a never ending story :-D -- 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: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands
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/widelands/fix_resource_overlay. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands
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/editor/editorinteractive.cc:135: No space after opening brace allowed!
3. /src/editor/editorinteractive.cc:635:9: Warnung: Die Standardfallbehandlung
in switch fehlt [-Wswitch-default]
switch (action) {
4. /src/scripting/lua_map.cc:4483: A space is mandatory after
catch/for/if/switch/throw/while.
5. /src/editor/ui_menus/editor_tool_change_resources_options_menu.cc:226: Bad
indentation.
Thanks for your work so far :-)
Approving functionality.
--
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: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525395 into lp:widelands
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-dev/widelands/bug-1525395. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/error_shadow into lp:widelands
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://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/new_legal_notice_page into lp:widelands-website
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 the contents of the website please take a look at our Contact page or post in the forums. Use the one of the following methods if you do not want to make an account: => There are several possibilities to get in contact with us. For questions about the game or the contents of the website, please take a look at our Contact page or post in the forums. Use one of the following methods if you do not want to create an account: -- 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://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/copyrightyear_and_links into lp:widelands-website
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 Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/iso_date_image_options into lp:widelands-website
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 @@
>
>
>
> - Code to use in article:
> + Code to use in article:
> + {# Show only one code snippet if the image is
> greater than 700px #}
> {% if img.image.width > 700 %}
> - []({{ img.url }})
> + []({{ img.url }})
> +
> + {# otherwise give all options #}
> {% else %}
> 
> +
> +
> + Right aligned:
> + {: .right}
> +
> +
> + Left aligned:
> + {: .left}
> +
> {% endif %}
> -
Please double-eheck the tr's - is the tr in line 47 still being closed?
> -
>
>
> {% endfor %}
--
https://code.launchpad.net/~widelands-dev/widelands-website/iso_date_image_options/+merge/282653
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/iso_date_image_options into
lp:widelands-website.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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 state like bound textures, framebuffers, and so on. Use this to avoid unneeded calls into the driver. - Combine all different blit programs into one and use a if in the fragment shader. This allows for more batching, taking load from the CPU and transferring it to the GPU. - Apply suggestion by nha: Recreate buffers on the GPU on each frame instead of trying to reuse the memory. These are the improvements that this buys: All benchmarks where run at 60 FPS, 3440x1440 resolution & fullscreen, on a map with lots of buildings, lots of textures on the screen, lots of different map objects. The game was paused, so that no logic code ate CPU. Census & statistics were disabled since they do not benefit from the texture atlas at all. pre renderqueue (revision 7691): ~90% CPU load, 41000 OpenGL calls per frame. post renderqueue (revision 7695): ~65% CPU load, 18300 OpenGL calls per frame. This commit: 28% CPU load, 3000 OpenGL calls per frame. An experimental version that loaded every image in Widelands into one 16kx16k texture atlas (1 GB of GPU RAMs was needed): 18% CPU load, 209 OpenGL calls. This proved unsustainable for most GPUs so it was dropped again. Worst to best rendering now only takes 32% CPU and 8% GL calls of what it used to. Possible improvements: The atlas creating could also compress the images by finding unchanging areas in animation. This would drastically reduce the size of the atlas and the use of GPU memory. This is described in bug 1121982. I am not motivated to work on this now though and I only consider it a nice to have. For more details, see: 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: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands
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-01-07 12:47:17 +
> +++ src/editor/editorinteractive.h2016-01-16 12:55:32 +
> @@ -129,17 +153,16 @@
>
> // state variables
> bool m_need_save;
> - struct PlayerReferences {
> - int32_t player;
> - void const * object;
> - };
> std::vector m_player_tribe_references;
>
> uint32_t m_realtime;
> bool m_left_mouse_button_is_down;
>
> - EditorHistory m_history;
> + std::unique_ptr m_tools;
> + std::unique_ptr m_history;
Time to rename to tools_, history_ etc?
>
> +
> std::unique_ptr>
> +field_resource_changed_subscriber_;
> UI::UniqueWindow::Registry m_toolmenu;
>
> UI::UniqueWindow::Registry m_toolsizemenu;
--
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: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands
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 should actually not be there. I prepare a branch to remove this warning. > I noticed that you use variable type "auto" a lot - please double-check if > you can be more specific. Strong typing is good ;) auto is not any less strong typing, since the compiler knows the exact type. In fact auto can be stronger typing than explicit types because it never does implicit conversion. int32_t a = 1; uint8_t b = 9; uint8_t c = a - b; // is a bug, underflow. auto c = a - b; // works, means type of c == int32_t, so all is good. If you feel it impedes readability in a specific place, I will add types of course. @bunnybot merge -- 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: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands
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 subscribed to branch lp:~widelands-dev/widelands/fix_resource_overlay. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_resource_overlay into lp:widelands
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: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/new_legal_notice_page into lp:widelands-website
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://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/copyrightyear_and_links into lp:widelands-website
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/stricter_travis into lp:widelands
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 regression test on travis after each build. Regression test now also output full stdout on error. - Make codecheck warnings critical errors for debug builds on travis. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/stricter_travis into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/stricter_travis into lp:widelands
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 after each build. Regression test now also output full stdout on error. - Make codecheck warnings critical errors for debug builds on travis. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Make CI more usefull. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/stricter_travis into lp:widelands. === modified file '.travis.sh' --- .travis.sh 2016-01-11 20:27:54 + +++ .travis.sh 2016-01-16 18:04:12 + @@ -2,7 +2,7 @@ # Some of these commands fail transiently. We keep retrying them until they # succeed. -if [ "$CXX" = "g++" ]; then +if [ "$CXX" = "g++" ]; then until sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; do sleep 10; done fi if [ "$CXX" = "clang++" ]; then @@ -12,7 +12,7 @@ until sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y; do sleep 10; done until sudo apt-get update -qq; do sleep 10; done -if [ "$CXX" = "g++" ]; then +if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-$GCC_VERSION; export CXX="g++-$GCC_VERSION" CC="gcc-$GCC_VERSION"; fi @@ -37,8 +37,24 @@ libsdl2-ttf-dev \ ; do sleep 10; done -# Start the actual build. +# Configure the build mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE:STRING="$BUILD_TYPE" + +# Any codecheck warning is an error in Debug builds. Keep the codebase clean!! +if [ "$BUILD_TYPE" == "Debug" ]; then + # Suppress color output. + TERM=dumb make -j1 codecheck 2>&1 | tee codecheck.out + if grep '^[/_.a-zA-Z]\+:[0-9]\+:' codecheck.out; then + echo "You have codecheck warnings (see above) Please fix." + exit 1 # CodeCheck warnings. + fi +fi + +# Do the actual build. make -k -j1 + +# Run the regression suite. +cd .. +./regression_test.py -b build/src/widelands === modified file '.travis.yml' --- .travis.yml 2016-01-10 19:00:06 + +++ .travis.yml 2016-01-16 18:04:12 + @@ -3,6 +3,11 @@ sudo: required dist: trusty +before_script: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + - sleep 3 # give xvfb some time to start + matrix: include: - compiler: clang === modified file 'CMakeLists.txt' --- CMakeLists.txt 2016-01-11 20:25:48 + +++ CMakeLists.txt 2016-01-16 18:04:12 + @@ -105,19 +105,11 @@ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-global-constructors") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-padded") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-sign-conversion") - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-switch-enum") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-missing-noreturn") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-implicit-fallthrough") # TODO(sirver): weak-vtables should be enabled, but leads to lot of errors right now. wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-weak-vtables") - - # This warning warns when a default case is at a switch that handles all - # cases. While this is super nice, silencing this warning for clang will add - # a warning for GCC (which is not as clever and does not figure out that all - # cases are handled). Therefore we disable the warning and the unreachable as - # they always come in pairs in these cases. - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-covered-switch-default") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs") @@ -158,7 +150,6 @@ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpointer-arith") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wredundant-decls") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsign-promo") - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wswitch-default") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsync-nand") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wtrampolines") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wundef") === modified file 'regression_test.py' --- regression_test.py 2014-06-22 12:02:10 + +++ regression_test.py 2016-01-16 18:04:12 + @@ -116,8 +116,8 @@ self.verify_success(stdout, stdout_filename) def verify_success(self, stdout, stdout_filename): -common_msg = "Analyze the files in %s to see why this test case failed. Stdout is\n %s\n" % ( -self.run_dir, stdout_filename) +common_msg = "Analyze the files in %s to see why this test case failed. Stdout is\n %s\n\nstdout:\n%s" % ( +self.run_dir, stdout_filename, stdout) self.assertTrue(self.widelands_returncode == 0, "Widelands exited abnormally. %s" % common_msg ) ___ Mailing list: https://launchpad.net/~widelands-dev Post to : wideland
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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 make sure to pause the game, otherwise the game logic will interfere with your benchmark. If your GPU is super quick at swapping textures, the difference to the renderqueue branch might be small. However, this branch should in no case be slower than trunk. -- 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: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/stricter_travis into lp:widelands
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/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
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 'master' (400/7709) progress revision 500 'master' (500/7709) progress revision 600 'master' (600/7709) progress revision 700 'master' (700/7709) progress revision 800 'master' (800/7709) progress revision 900 'master' (900/7709) progress revision 1000 'master' (1000/7709) progress revision 1100 'master' (1100/7709) progress revision 1200 'master' (1200/7709) progress revision 1300 'master' (1300/7709) progress revision 1400 'master' (1400/7709) progress revision 1500 'master' (1500/7709) progress revision 1600 'master' (1600/7709) progress revision 1700 'master' (1700/7709) progress revision 1800 'master' (1800/7709) progress revision 1900 'master' (1900/7709) progress revision 2000 'master' (2000/7709) progress revision 2100 'master' (2100/7709) progress revision 2200 'master' (2200/7709) progress revision 2300 'master' (2300/7709) progress revision 2400 'master' (2400/7709) progress revision 2500 'master' (2500/7709) progress revision 2600 'master' (2600/7709) progress revision 2700 'master' (2700/7709) progress revision 2800 'master' (2800/7709) progress revision 2900 'master' (2900/7709) progress revision 3000 'master' (3000/7709) progress revision 3100 'master' (3100/7709) progress revision 3200 'master' (3200/7709) progress revision 3300 'master' (3300/7709) progress revision 3400 'master' (3400/7709) progress revision 3500 'master' (3500/7709) progress revision 3600 'master' (3600/7709) progress revision 3700 'master' (3700/7709) progress revision 3800 'master' (3800/7709) progress revision 3900 'master' (3900/7709) progress revision 4000 'master' (4000/7709) progress revision 4100 'master' (4100/7709) progress revision 4200 'master' (4200/7709) progress revision 4300 'master' (4300/7709) progress revision 4400 'master' (4400/7709) progress revision 4500 'master' (4500/7709) progress revision 4600 'master' (4600/7709) progress revision 4700 'master' (4700/7709) progress revision 4800 'master' (4800/7709) progress revision 4900 'master' (4900/7709) progress revision 5000 'master' (5000/7709) progress revision 5100 'master' (5100/7709) progress revision 5200 'master' (5200/7709) progress revision 5300 'master' (5300/7709) progress revision 5400 'master' (5400/7709) progress revision 5500 'master' (5500/7709) progress revision 5600 'master' (5600/7709) progress revision 5700 'master' (5700/7709) progress revision 5800 'master' (5800/7709) progress revision 5900 'master' (5900/7709) progress revision 6000 'master' (6000/7709) progress revision 6100 'master' (6100/7709) progress revision 6200 'master' (6200/7709) progress revision 6300 'master' (6300/7709) progress revision 6400 'master' (6400/7709) progress revision 6500 'master' (6500/7709) progress revision 6600 'master' (6600/7709) progress revision 6700 'master' (6700/7709) progress revision 6800 'master' (6800/7709) progress revision 6900 'master' (6900/7709) progress revision 7000 'master' (7000/7709) progress revision 7100 'master' (7100/7709) progress revision 7200 'master' (7200/7709) progress revision 7300 'master' (7300/7709) progress revision 7400 'master' (7400/7709) progress revision 7500 'master' (7500/7709) progress revision 7600 'master' (7600/7709) fatal: stream ends early fast-import: dumping crash report to .git/fast_import_crash_9861 fatal: Error while running fast-import -- 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/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
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/widelands/png_alternative_method into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
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_alternative_method/+merge/282856 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/png_alternative_method into lp:widelands
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: "Warnings with newer libpng versions (iCCP: known incorrect sRGB profile)" https://bugs.launchpad.net/widelands/+bug/1195724 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Attempt to fix bug 1195724 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
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/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
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 @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- 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 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
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 understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- 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/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
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:~widelands-dev/widelands/png_alternative_method into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
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_travis. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
