[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into lp:widelands

2016-04-04 Thread bunnybot
Continuous integration builds have changed state: Travis build 961. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/120671195. Appveyor build 794. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1538549_

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

2016-04-04 Thread Klaus Halfmann
Uhm, the fix for bug-1562332 was somehow reverted, I will add it in this branch again -- https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/travis-clang-warnings.

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

2016-04-04 Thread Klaus Halfmann
I got a crash in 0 widelands 0x00010d0cfa40 FullscreenMenuInternetLobby::fill_client_list(std::__1::vector > const*) + 2336 (vector:641) 1 widelands 0x00010d0cf0e2 FullscreenMenuInternetLobby::think() + 146 (internet_lobby.cc:182) but this is the same on trunk. @SirVer I will re

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into lp:widelands

2016-04-04 Thread TiborB
Just lately I modified AI to sent away wares before upgrading, but I believe no conflict here... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-15385

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into lp:widelands

2016-04-04 Thread Miroslav Remák
Review: Approve code review + testing LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings. __

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

2016-04-04 Thread SirVer
Removing both 'std::move's is fine if all GCCs eat it. In fact the compiler is right and an explicit move might make a copy elision there illegal. However, I doubt it matters for performance much - if at all. -- https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/29

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into lp:widelands

2016-04-04 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into lp:widelands. Commit message: For the dismantle function, buildings now check which wares the tribe can use and adjust the dismantle button / returned wares accordingly. Requested reviews: W

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 -- Your team Widelands Developers is subs

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread GunChleoc
OK, thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap. ___ Mailing list: https://

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
I don't have any experience with automatic formatting tools besides auto-indent in my IDE. I was suggesting doing it manually for these few lines (the rest is OK), but it can be done later. I think you can go ahead and merge it as it is then. -- https://code.launchpad.net/~widelands-dev/widelan

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread GunChleoc
What would you suggest regarding the prettyfying? Indents are a problem with my IDE - we will run clang-format over the codebase before branching Build 19 to fix these issues. -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Develope

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

2016-04-04 Thread GunChleoc
I am waiting on a comment from SirVer regarding 4. before merging ;) -- https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/travis-clang-warnings. __

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

2016-04-04 Thread Klaus Halfmann
Hello Gun: changes look good to me, Compiles on OSX without any new Issues. Will try to play this on trunk today. (Thanks for playing the Triangle :-) -- https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697 Your team Widelands Developers is subscribed to branc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
The constructor would probably need prettifying as well. -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
Fine with me. Could you also fix the inconsistent indentation of that lambda? -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap. _

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

2016-04-04 Thread bunnybot
Continuous integration builds have changed state: Travis build 951. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/120451312. Appveyor build 784. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread GunChleoc
Review: Resubmit I decided to refactor this into a function. What do you think? -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap. ___ Mailing list: https://launch