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

2016-05-16 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1418154-collectors-teams/+merge/294702 -- Your team Widelands Deve

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

2016-05-16 Thread GunChleoc
The missing gold was a bug in the formatting code. Good catch! :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1418154-collectors-teams/+merge/294702 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1418154-collectors-teams. __

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-16 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 -- Your team Widelands De

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-16 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2. ___ Mailing list: https

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-16 Thread Miroslav Remák
> I think this branch is a significant improvement in any case, shall we merge > it? Whatever Tino is experiencing seems to be unrelated to this merge request, so I'd say let's merge it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team

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

2016-05-16 Thread Miroslav Remák
Review: Needs Fixing code, running Review in the diff comments. JSON seems to be generated properly, but I don't have the website set up, so I am unable to test with your other branch there. Diff comments: > > === modified file 'src/CMakeLists.txt' > --- src/CMakeLists.txt2016-02-06 11

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

2016-05-16 Thread Klaus Halfmann
Review: Approve compile, test, codereviw Ok, statistics are fine now too, you may still include the gold in the status message (e.g. I increased my Gold Production an gained some 100 points this way) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1418154-collectors-teams/+merge/29470

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

2016-05-16 Thread bunnybot
Continuous integration builds have changed state: Travis build 1023. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/123856414. Appveyor build 855. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_trident_sp-

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

2016-05-16 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: The read operation timed out -- https://code.launchpad.net/~widelands-dev/widelands/trident-sp/+merge/292121 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/trident-sp into

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

2016-05-16 Thread Klaus Halfmann
About the gold: it does _not_ appear in the status message, thats the bug. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1418154-collectors-teams/+merge/294702 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1418154-collecto

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

2016-05-16 Thread kaputtnik
> > > - Automatically focus map name editbox when creating new map > > I couldn't find this feature :-S Either it is not working or i do not > > understand it. > > Sorry, I meant create directory, not create map. If i create a new directory the map name editbox isn't focused here ("f" button tog

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

2016-05-16 Thread GunChleoc
Yes, gold is counted. https://bazaar.launchpad.net/~widelands-dev/widelands/bug-1418154-collectors-teams/view/head:/data/scripting/win_conditions/collectors.lua#L48 > A small nit: After the "you have lost message" I get a last status message, > thats OK. > > But it claims "The Game will end in .