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

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/cricket_frog_sounds into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/cricket_frog_sounds/+merge/283511 -- Your team Widelands Developers is subscrib

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

2016-01-23 Thread kaputtnik
> Have you tested that this doesn't regress > https://bugs.launchpad.net/widelands/+bug/1522564? This branch regresses that bug. It looks likes the images are in an additional row. I attached a screenshot to the bug, look : https://bugs.launchpad.net/widelands/+bug/1522564/+attachment/4555267/

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: - Fixed numbering inconsistency in production program strings. - Fixed Purpose helptext for Battle Ax. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #142194

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1530723 into lp:widelands. Commit message: WordWrap no longer checks the safety margin for empty text. This fixes a crash in the Game Results screen. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #153

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/bug-1530723 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1530723 You can give me commands by starting a line with @bunnybot . I understa

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/string-fixes mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_string_fixes You can give me commands by starting a line with @bunnybot . I unders

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

2016-01-23 Thread Tino
Review: Approve Travis and Appveyor build ok, should we merge? -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___

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

2016-01-23 Thread GunChleoc
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_editor_transparency_issue/+merge/282874 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_editor_transparency_issue. _

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

2016-01-23 Thread GunChleoc
The problem is that blitrect_scale doesn't crop. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/memory_leak into lp:widelands. ___

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

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_editor_transparency_issue into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_editor_transparency_issue/+merge/282874 -- Your team Widelands De

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

2016-01-23 Thread SirVer
Okay. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ Mailing list: https://launchpad.net/~wid

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

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/stricter_travis into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 -- Your team Widelands Developers is subscribed to br

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Travis build 348 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/104266073. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widel

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

2016-01-23 Thread kaputtnik
I get increasing memory for about 30-100k per second. Opening the message window does not increase the memory usage anymore. All looks good, except the overlapping images in the message menu. Do not approve, because bug 1522564 is linked here. -- https://code.launchpad.net/~widelands-dev/widela

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1532279 into lp:widelands. Commit message: Increased label height in spinboxes to avoid autogeneration of scrollbar button by the MultilineTextarea. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1532

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

2016-01-23 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1532279 into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720 -- Your team Widelands Developers is requested to r

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1532279 into lp:widelands. Commit message: Increased label height in spinboxes to avoid autogeneration of scrollbar button by the MultilineTextarea. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1532

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

2016-01-23 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/memory_leak into lp:widelands has been updated. Commit Message changed to: - Fix big memory leak and extra work in UI::Table::draw. - Fix a couple of minor memory leaks around the code I found using the Leaks tool in Apple's Instruments. - Corre

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

2016-01-23 Thread SirVer
> I get increasing memory for about 30-100k per second. Does this ever stop or grow boundless? I just pushed a commit that should fix bug 1522564 too. This is ready for code review and another round of testing. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Yo

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/bug-1532279 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1532279 You can give me commands by starting a line with @bunnybot . I understa

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

2016-01-23 Thread kaputtnik
Review: Approve functionality No crash anymore when winning a game :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1530723. ___

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

2016-01-23 Thread kaputtnik
It increases boundless. I believe this caused by the wares which are produced... but i am not sure. Today i have no time anymore for testing. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is requested to review the proposed merge

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/codecheck_compiler_fixes into lp:widelands. Commit message: - Fixed some codecheck and compiler warnings - Fixed crash with assert in launch_mpg when selection of game or map to load is cancelled. Requested reviews: Widelands Develope

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

2016-01-23 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1532279 into lp:widelands has been updated. Commit Message changed to: - Increased label height in spinboxes to avoid autogeneration of scrollbar button by the MultilineTextarea. - Added size offset to some fonts that were too small. For mo

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/codecheck_compiler_fixes mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_codecheck_compiler_fixes You can give me commands by starting a line wi

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

2016-01-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1537157 into lp:widelands. Commit message: Changed msgxctxt variable for Productionsites from char* to std::string to fix problem with loading descname translations. Requested reviews: Widelands Developers (widelands-dev) Related

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/bug-1537157 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1537157 You can give me commands by starting a line with @bunnybot . I understa

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

2016-01-23 Thread Tino
Review: Approve LGTM. Compiled and tested, no untranslated strings any longer! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157. ___

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Travis build 352 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/104286335. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/wide

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

2016-01-23 Thread Tino
Review: Approve I do not experience any more memory leaking on windows. And no overlapping icons in the message menu. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak.

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Travis build 353 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/104294117. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widel

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Travis build 354 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/104294390. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak. __

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

2016-01-23 Thread TiborB
The proposal to merge lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands has been updated. Commit Message changed to: - Ships now get own names, picked from lists per tribe. - reworked the way how AI manages expeditions - Reworked the way how AI stores some date in Player object (Game

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

2016-01-23 Thread TiborB
OK, all incorporated. Will we wait for Travis build status? -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ Mail

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

2016-01-23 Thread TiborB
Review: Approve Code looks good :) my first bunnybot merge:) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1530723. ___

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

2016-01-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1530723 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1530723/+merge/283713 -- Your team Widelands Developers is subscribed to branch lp

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

2016-01-23 Thread SirVer
Naaa, what cam Possibly go wrong :) Yolo @bunnybot merge > Am 23.01.2016 um 20:42 schrieb TiborB : > > OK, all incorporated. Will we wait for Travis build status? > -- > https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 > You are reviewing the proposed merg

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

2016-01-23 Thread TiborB
OK! I am glad I got rid of this finally :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ Mailing list: https://

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr merge ../_widelands_dev_widelands_ai_ship_tweaks' failed. Output: +N src/game_io/game_player_ai_persistent_packet.cc +N src/game_io/game_player_ai_persistent_packet.h +N test/maps/ship_transportation.wmf/scripting

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Travis build 357 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/104304983. -- https://code.launchpad.net/~widelands-dev/widelands/codecheck_compiler_fixes/+merge/283722 Your team Widelands Developers is requested to review the proposed merge of lp:~widela

[Widelands-dev] Bunnybot says...

2016-01-23 Thread bunnybot
Travis build 358 has changed state to: failed. Details: https://travis-ci.org/widelands/widelands/builds/104307496. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157. __

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

2016-01-23 Thread GunChleoc
Review: Approve Graphics now look OK on Ubuntu. Code LGTM. Travis fail is because of Codecheck - I fixed all but 1 Codecheck warning in https://code.launchpad.net/~widelands-dev/widelands/codecheck_compiler_fixes/+merge/283722. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/

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

2016-01-23 Thread GunChleoc
I'll merge this without bunnybot, because the problem is with codecheck in trunk. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157.

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

2016-01-23 Thread SirVer
I am sorry about the codecheck in master :( That's what you get if you think a small chance is not worthy of code review :/ You can still use bunnybot if you want, it does not require travis to pass. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widel

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

2016-01-23 Thread SirVer
Review: Approve code lgtm -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157. ___ Mailing list: https://launchpad.net/~widelan

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

2016-01-23 Thread GunChleoc
OK, SirVer just fixed, so I'll merge trunk instead. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157. ___ Mailing list: https

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

2016-01-23 Thread SirVer
Review: Approve lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/codecheck_compiler_fixes/+merge/283722 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/codecheck_compiler_fixes. ___ Mail

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

2016-01-23 Thread SirVer
Seems like you need to merge trunk before merging. -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ Mailing list:

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

2016-01-23 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/codecheck_compiler_fixes into lp:widelands has been updated. Commit Message changed to: - Fixed some compiler warnings - Fixed crash with assert in launch_mpg when selection of game or map to load is cancelled. For more details, see: https://co

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

2016-01-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157. ___ Mailing list: https://launchpad.net/~widelands-dev Post