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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 502. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/106279022. Appveyor build 383. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_clang_codec

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

2016-02-01 Thread SirVer
Review: Approve > the hopping doesn't work, but it's already broken in trunk. Is there a bug for that? We should fix it for b19, no point in shipping a broken scenario. Same questions also for Smugglers. Otherwise lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/m

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

2016-02-01 Thread SirVer
Review: Approve Great improvements. One nit and travis green and this is good to go. Diff comments: > === modified file 'src/logic/map_objects/tribes/building.cc' > --- src/logic/map_objects/tribes/building.cc 2016-01-29 08:37:22 + > +++ src/logic/map_objects/tribes/building.cc 2016-02-0

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

2016-02-01 Thread SirVer
Review: Approve We could add a codecheck that runs clang-format and complains if the output is different to what clang format produces. But that might be brittle as clang-format is slightly changing between versions IMHO. One nit, otherwise lgtm. Diff comments: > > === removed file 'cmake/c

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 501. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/106278754. Appveyor build 382. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_obsolete_fo

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

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

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

2016-02-01 Thread SirVer
Review: Approve @bunnybot merge Yups, looks correct to me. -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warning/+merge/284659 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warning. ___

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 500. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/106278352. Appveyor build 381. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_tags_again-3

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

2016-02-01 Thread GunChleoc
Review: Approve Code LGTM :) This can be merged as soon as Travis passes. -- https://code.launchpad.net/~widelands-dev/widelands/ai_parameters_tweak/+merge/284667 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_parameters_tweak. ___

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

2016-02-01 Thread GunChleoc
I think I found them - pushed a fix to trunk. Please let me know if this fixes trunk. -- https://code.launchpad.net/~widelands-dev/widelands/tags_again/+merge/284636 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tags_again into lp:widelan

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

2016-02-01 Thread GunChleoc
This will be a problem caused by r7764 and it is not related to this branch. Could you please open a bug report and also say which of the tests is failing for you? -- https://code.launchpad.net/~widelands-dev/widelands/tags_again/+merge/284636 Your team Widelands Developers is requested to revie

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

2016-02-01 Thread GunChleoc
I agree that this still needs more fixing - right now, I just want to get rid of the crash. I tried fiddling wit it a bit, but as soon as I try to get the FCoords from the Coords, the player positions get messed up, and I have no idea why yet. So, I am for merging this and leaving the bug open.

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 497. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/106265191. Appveyor build 379. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_help-

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

2016-02-01 Thread TiborB
Well, the same problem in trunk ??? -- https://code.launchpad.net/~widelands-dev/widelands/tags_again/+merge/284636 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tags_again into lp:widelands. __

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

2016-02-01 Thread TiborB
Well I dont know if I messed up something but no regression test works here: Caught exception (of type '18FileNotFound_error') in outermost handler! The exception said: Could not find filename: could not find file or directory: pics/wl-ico-128.png This should not happen. Please file a bug report

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

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

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

2016-02-01 Thread TiborB
TiborB has proposed merging lp:~widelands-dev/widelands/ai_parameters_tweak into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_parameters_tweak/+merge/284667 This is only change of few number

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

2016-02-01 Thread kaputtnik
So a user make a random map, saves it and when trying to start a game with this map an error message is shown because no player position is set. Then he has to start the editor again, load the map again and probably figure out how to set player positions... And he may think he has to do this alw

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

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

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

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

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/compiler_warning into lp:widelands. Commit message: Fixed compiler warning and updated comment in game_renderer.cc. Requested reviews: SirVer (sirver) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/compiler

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1535065 into lp:widelands. Commit message: Unset player starting position in MapGenerator if coordinates are illegal. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1535065 in widelands: "Editor crashe

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

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

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/tags_again into lp:widelands. Commit message: Added a test for the text renderer to make sure that does not crash. This test checks Tables, Listselect and MultilineTextarea. Requested reviews: Widelands Developers (widelands-dev) Rel

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 485. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/106181759. Appveyor build 370. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 484. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/106170617. Appveyor build 366. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_beautiful_co

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 483. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/106161900. Appveyor build 355. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_help-

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 482. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/106159915. Appveyor build 354. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_map_packet_l

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

2016-02-01 Thread GunChleoc
Thanks, Tibor! All fixed now :) -- https://code.launchpad.net/~widelands-dev/widelands/clang-codecheck/+merge/284586 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/clang-codecheck into lp:widelands.

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

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

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/obsolete_format_macro into lp:widelands. Commit message: Cleaned up switch statement in Building::info_string: Replaced FORMAT macro with enum class and got rid of unused cases. Requested reviews: Widelands Developers (widelands-dev)

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

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

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

2016-02-01 Thread TiborB
My answer is in the diff Diff comments: > > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2016-01-24 17:01:59 + > +++ src/ai/defaultai.cc 2016-02-01 11:17:20 + > @@ -215,8 +215,8 @@ > } > } >

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/clang-codecheck into lp:widelands. Commit message: Prepared the codecheck rules and source code to be compatible with clang-format. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.

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

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

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

2016-02-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 472. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/106067227. Appveyor build 365. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500

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

2016-02-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1397500 into lp:widelands. Commit message: Moved GL shaders into external files. Fragment shaders now live in "data/shaders/.fp" and vertex shaders in "data/shaders/.vp". Requested reviews: Widelands Developers (widelands-dev) Re

[Widelands-dev] [Build #8922585] amd64 build of widelands 1:18-ppa0-bzr7764-201602010946~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010946~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 32 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wi

[Widelands-dev] [Build #8922592] amd64 build of widelands 1:18-ppa0-bzr7764-201602010946~ubuntu15.04.1 in ubuntu vivid RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010946~ubuntu15.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 20 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wi

[Widelands-dev] [Build #8922591] i386 build of widelands 1:18-ppa0-bzr7764-201602010946~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010946~ubuntu15.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 20 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wid

[Widelands-dev] [Build #8922593] i386 build of widelands 1:18-ppa0-bzr7764-201602010946~ubuntu15.04.1 in ubuntu vivid RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010946~ubuntu15.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 19 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wid

[Widelands-dev] [Build #8922590] amd64 build of widelands 1:18-ppa0-bzr7764-201602010946~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010946~ubuntu15.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 19 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wi

[Widelands-dev] [Build #8922588] amd64 build of widelands 1:18-ppa0-bzr7764-201602010947~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010947~ubuntu16.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 19 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wi

[Widelands-dev] [Build #8922589] i386 build of widelands 1:18-ppa0-bzr7764-201602010947~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010947~ubuntu16.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 19 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wid

[Widelands-dev] [Build #8922586] i386 build of widelands 1:18-ppa0-bzr7764-201602010946~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]

2016-02-01 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:18-ppa0-bzr7764-201602010946~ubuntu14.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 17 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wid

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

2016-02-01 Thread Tino
The lines look very good! I do not get any crashes, but can confirm kaputtniks discovery in the wares production window. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~wi