[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1252625-statistics-window-update into lp:widelands

Continuous integration builds have changed state: Travis build 866. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/117151810. Appveyor build 701. State: success. Details:

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

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-graphic into lp:widelands. Commit message: Refactored member variables in src/graphic. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1395278 in widelands: "Consolidate naming of member

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

The proposal to merge lp:~widelands-dev/widelands/ship_DBG_window into lp:widelands has been updated. Commit Message changed to: Ships get debug window. Also its content are extended. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ship_DBG_window/+merge/289110 --

Re: [Widelands-dev] Widelands::OPtr

Glad you found it :) Sgrìobh Tibor Bamhor na leanas 16/03/2016 aig 10:18: > OK, I found that right syntax is > > destination_.get(egbase)->get_dock_position().x > > 2016-03-16 10:28 GMT+01:00 Tibor Bamhor >: > > I run into this compilation

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

Seems some pre installation scripts failed (downloading InnoSetup) on Appveyor. I've triggered a re-build of this commit: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395278_scripting-686 --

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

This basically fixes bug #1550568 in a better way in terms of performance. -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/improve-restool into

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

Played this for a while now, found no anomalies. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-editor/+merge/289494 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-editor. ___ Mailing

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

OK, let's merge this then :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ship_DBG_window/+merge/289110 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_DBG_window. ___ Mailing list:

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

Review: Approve testing Works fine :-) -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/improve-restool. ___ Mailing list:

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

@tiborb95 Yes, an empty undo action is created. Unfortunately, it doesn't seem to be trivial to fix because of all the "draw tool" mess. -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is subscribed to branch

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

Miroslav Remák has proposed merging lp:~widelands-dev/widelands/watchwindow-fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/watchwindow-fixes/+merge/289573 - Fixes some oddities such

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

No problem, I understand this is out of scope of this fix -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/improve-restool. ___

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

I think we should go through all the clang warnings on Travis sometime and fix. Added replies to your comments. Diff comments: > > === modified file 'src/editor/tools/editor_increase_height_tool.h' > --- src/editor/tools/editor_increase_height_tool.h2016-01-28 05:24:34 > + > +++

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

Review: Approve LGTM I see appveyor reports failed... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-scripting/+merge/288975 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-scripting.

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

Sounds good to me then - I can take care of 1. when you're finished with reworking the info. -- https://code.launchpad.net/~widelands-dev/widelands/ship_DBG_window/+merge/289110 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_DBG_window.

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

The proposal to merge lp:~widelands-dev/widelands/bug-1395278-graphic into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-graphic/+merge/289402 -- Your team Widelands Developers is

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-network-io-wui into lp:widelands

The proposal to merge lp:~widelands-dev/widelands/bug-1395278-network-io-wui into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-network-io-wui/+merge/289557 -- Your team Widelands

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

The proposal to merge lp:~widelands-dev/widelands/bug-1395278-scripting into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-scripting/+merge/288975 -- Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-network-io-wui into lp:widelands

Thanks! @bunnybot merge Diff comments: > === modified file 'src/io/filesystem/layered_filesystem.cc' > --- src/io/filesystem/layered_filesystem.cc 2016-02-18 18:27:52 + > +++ src/io/filesystem/layered_filesystem.cc 2016-03-19 10:27:47 + > @@ -89,7 +89,7 @@ >

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1252625-statistics-window-update into lp:widelands

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1252625-statistics-window-update into lp:widelands. Commit message: Plot areas now update their data less often. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1252625 in widelands: "General

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-network-io-wui into lp:widelands

Review: Approve Found only renamings that are fine with me. Copiled this and played it a while, found no anomalies. Diff comments: > === modified file 'src/io/filesystem/layered_filesystem.cc' > --- src/io/filesystem/layered_filesystem.cc 2016-02-18 18:27:52 + > +++

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands

The proposal to merge lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/memleaks-and-uninit-vars/+merge/289561 -- Your team Widelands Developers

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

Review: Approve Exactly how I meant it! BTW, how the game behaves if no fields are changed? Is "empty" undo action created? I have not tested it -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands

@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/memleaks-and-uninit-vars/+merge/289561 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memleaks-and-uninit-vars. ___ Mailing list:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-network-io-wui into lp:widelands

Continuous integration builds have changed state: Travis build 859. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/117091384. Appveyor build 694. State: success. Details:

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

Yes, I was unable to find current repositories for everything. Our only solution for this is to get the update to Django 1.8 working. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team Widelands Developers is subscribed to branch

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

Thanks for the review :) AppVeyor fails a lot on the downloads - the service is quite new, and I guess they're still working out the kinks. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-scripting/+merge/288975 Your team Widelands Developers is subscribed to

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

And similarly, for increasing resources - do nothing if resources are at max and for decreasing do nothing if resources are currently at 0. ? -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is requested to review the proposed

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/show-ship-names into lp:widelands

GunChleoc has proposed merging lp:~widelands-dev/widelands/show-ship-names into lp:widelands. Commit message: Added census/statistics strings to ships and ship construction. Ship states are now an enum class. Requested reviews: Widelands Developers (widelands-dev) For more details, see:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands

Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/memleaks-and-uninit-vars/+merge/289561 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memleaks-and-uninit-vars. ___ Mailing list:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands

Miroslav Remák has proposed merging lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/memleaks-and-uninit-vars/+merge/289561 This also

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-network-io-wui into lp:widelands

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1395278-network-io-wui into lp:widelands. Commit message: Refactored remaining member variables. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1395278 in widelands: "Consolidate naming of member

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

Review: Approve testing I think all is fine now :-) -- https://code.launchpad.net/~widelands-dev/widelands/about/+merge/288697 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/about. ___ Mailing list:

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

Gun, I am done, it is your turn now -- https://code.launchpad.net/~widelands-dev/widelands/ship_DBG_window/+merge/289110 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_DBG_window. ___ Mailing list:

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

Review: Approve I'm done - I prettied things up a bit. I noticed that the information on the bottom just keeps expanding rather than being replaces. Is this on purpose? If it is on purpose, please feel free to merge. Otherwise, please fix. --

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

Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-graphic/+merge/289402 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-graphic. ___ Mailing list:

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

It looks good to me, just look at small question in diff Diff comments: > > === modified file 'src/editor/tools/editor_set_resources_tool.cc' > --- src/editor/tools/editor_set_resources_tool.cc 2016-01-14 22:09:24 > + > +++ src/editor/tools/editor_set_resources_tool.cc 2016-03-16

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

The proposal to merge lp:~widelands-dev/widelands/bug-1395278-editor into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-editor/+merge/289494 -- Your team Widelands Developers is

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

Done. -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/improve-restool into lp:widelands. ___ Mailing list:

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

Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-editor/+merge/289494 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-editor. ___ Mailing list: