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

2016-05-14 Thread GunChleoc
Review: Resubmit The output path is now defined on the command line when calling the executable. If the new changes are OK, this can go in now. -- https://code.launchpad.net/~widelands-dev/widelands/map_object_info/+merge/287409 Your team Widelands Developers is subscribed to branch lp:~widelan

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

2016-05-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_object_info into lp:widelands. Commit message: Created a new executable that will generate JSON files for updating the encyclopedia on the website. Requested reviews: GunChleoc (gunchleoc) kaputtnik (franku): testing Related bug

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

2016-05-14 Thread GunChleoc
The C++ code has been updated now to specify the output dir on the command line. I can't get the website code to run after my recent system upgrade though, so I don't know how to finish up this branch :( -- https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410 Yo

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

2016-05-14 Thread bunnybot
Continuous integration builds have changed state: Travis build 797. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/113180179. Appveyor build 643. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_map_object_in

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

2016-05-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_tut1_destroy_quarries into lp:widelands. Commit message: Trigger destroy_quarries_message in Tutorial 1 with 1 message. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~wid

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1581647-compiler-warnings into lp:widelands

2016-05-14 Thread kaputtnik
Review: Approve compiling Compiles fine again. Except the warnings regarding NEVER_HERE(): Warnung: throw will always call terminate() [-Wterminate] Seems to be ok then. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1581647-compiler-warnings/+merge/294698 Your team Widelands Develo

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands

2016-05-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands. Commit message: Collectors now reports team scores as well as player scores. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1418154 in widelands: "Collectors

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1581647-compiler-warnings into lp:widelands

2016-05-14 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1581647-compiler-warnings/+merge/294698 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1581647-compiler-warnings. ___ Mailing li

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1581647-compiler-warnings into lp:widelands

2016-05-14 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1581647-compiler-warnings into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1581647-compiler-warnings/+merge/294698 -- Your team Widelands De

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

2016-05-14 Thread Klaus Halfmann
Review: Approve compile, play This was an easy one :-) -- https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries/+merge/294699 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_tut1_destroy_quarries. ___

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

2016-05-14 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries/+merge/294699 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_tut1_destroy_quarries. ___ Mailing list: http

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

2016-05-14 Thread Miroslav Remák
Umm, this kinda invalidates the following message box talking about having received multiple messages. Also, I think a much better fix would be to count messages tied to fields first_quarry_field and second_quarry_field. -- https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_qua

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

2016-05-14 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_tut1_destroy_quarries into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries/+merge/294699 -- Your team Widelands Developers

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

2016-05-14 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/fix_tut1_destroy_quarries_2 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries_2/+merge/294713 The 'dest

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

2016-05-14 Thread bunnybot
Continuous integration builds have changed state: Travis build 1114. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/130181884. Appveyor build 951. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_map_object_

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

2016-05-14 Thread kaputtnik
Have you tried the wl_django1_8 branch? Even if some things won't work with this branch (mainly the third party apps) it should work for testing your changes. We could also try to submit my latest wlwebsite installation as a zipfile from me to you and you could try to use it. But i am not sure i

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

2016-05-14 Thread TiborB
TiborB has proposed merging lp:~widelands-dev/widelands/bug-1566441_Saving_game into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1566441 in widelands: "String "Saving Game" appears too late " https://bugs.launchpad.net/widelands/+bug/1566441 For

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

2016-05-14 Thread GunChleoc
Excellent :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries_2/+merge/294713 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_tut1_destroy_quarries_2 into lp:widelands. __

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

2016-05-14 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_tut1_destroy_quarries_2 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries_2/+merge/294713 -- Your team Widelands Develo

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands

2016-05-14 Thread bunnybot
Continuous integration builds have changed state: Travis build 1120. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/130243262. Appveyor build 957. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1418154