[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1675179-lua-hide-fields into lp:widelands

2017-04-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1675179-lua-hide-fields into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1675179-lua-hide-fields/+merge/320981 -- Your team Widelands

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

2017-04-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2106. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/224541702. Appveyor build 1941. State: success. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1675179-lua-hide-fields into lp:widelands

2017-04-21 Thread SirVer
Review: Approve - It only affects the current player, other players' and critters' states shouldn't care about what I see afaik the only thing that does look at your current vision is the scout. And if you have a different vision table than some other host on the game around the area of the

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

2017-04-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2102. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/224419857. Appveyor build 1937. State: success. Details:

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

2017-04-21 Thread GunChleoc
Fixed one of your nits. Regarding the comment, I think it's important to have it, and we can't have it without it showing up on the homepage. I don't mind, but if you think we should have the worker program reference first, we can delay the merge. --

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

2017-04-21 Thread GunChleoc
Oops, I didn't notice those. Quick push before bunnybot snaps it up for merging. -- https://code.launchpad.net/~widelands-dev/widelands/save_refactor/+merge/322622 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/save_refactor.

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

2017-04-21 Thread kaputtnik
I am struggling with the different coloring of texts: In Load screen there is yellow for constants (like 'Map Name:') and yellow for variables. In save screen this is vice versa. In general an improvement though :-) --

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

2017-04-21 Thread kaputtnik
Review: Approve testing Started multiplayer game: Map was 'The Nile', set tribes with no problems, saved the game and reloaded it without problems. So from my side it's ok now :-) -- https://code.launchpad.net/~widelands-dev/widelands/wincondition_dropdown_multiplayer/+merge/322196 Your team

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

2017-04-21 Thread kaputtnik
Review: Approve website related Works for the website related stuff :-) Anyway two diff comments. Diff comments: > > === modified file 'data/tribes/workers/atlanteans/carrier/init.lua' > --- data/tribes/workers/atlanteans/carrier/init.lua 2017-02-12 09:10:57 > + > +++

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

2017-04-21 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1512093-workers into lp:widelands has been updated. Commit Message changed to: Added sphinx documentation for workers. Shifted ware hotspot from WorkerDescr to CarrierDescr. For more details, see:

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

2017-04-21 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1512093-workers into lp:widelands. Commit message: Added sphinx documentation for workers. Requested reviews: Widelands Developers (widelands-dev) For more details, see:

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

2017-04-21 Thread SirVer
Review: Needs Fixing Diff comments: > === modified file 'src/logic/save_handler.cc' > --- src/logic/save_handler.cc 2017-01-25 18:55:59 + > +++ src/logic/save_handler.cc 2017-04-21 16:12:49 + > @@ -37,25 +37,119 @@ > #include "wlapplication.h" > #include "wui/interactive_base.h" >

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

2017-04-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2099. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/224275409. Appveyor build 1934. State: success. Details:

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

2017-04-21 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 2096. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/224242140. -- https://code.launchpad.net/~widelands-dev/widelands/save_refactor/+merge/322622 Your team

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

2017-04-21 Thread GunChleoc
The crash should be fixed now - I had to wait for a debug build first ;) -- https://code.launchpad.net/~widelands-dev/widelands/wincondition_dropdown_multiplayer/+merge/322196 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/wincondition_dropdown_multiplayer.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire-mission-3 into lp:widelands

2017-04-21 Thread GunChleoc
I did a first round of proofreading on the texts. Note that objective names are identifier code and should chosen to make this obvious - a-z and _ only. For example: obj_find_artifacts = { name = "Find the pieces of Neptune's shrine", should be obj_find_artifacts = { name =

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

2017-04-21 Thread Klaus Halfmann
I stil get the crash when starting a saved multiplayer game. Do you need a detailed crashreport? -- https://code.launchpad.net/~widelands-dev/widelands/wincondition_dropdown_multiplayer/+merge/322196 Your team Widelands Developers is subscribed to branch

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

2017-04-21 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/savegame-menu into lp:widelands. Commit message: Refactored load- and savegame screens - New common class GameDetails to show information about savegames, analogous to MapDetails - More informative savegame screen - Load/Savegame

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

2017-04-21 Thread GunChleoc
I found & fixed another bug where the dropdown wasn't disabled for the client with savegames. I can reproduce the crash but not the disappearing tribe dropdown. -- https://code.launchpad.net/~widelands-dev/widelands/wincondition_dropdown_multiplayer/+merge/322196 Your team Widelands Developers