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

2016-01-31 Thread SirVer
lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/map_plateau_textdomain/+merge/284535 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/map_plateau_textdomain into lp:widelands.

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

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

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

2016-01-31 Thread Tino
Review: Approve test local build & appveyor Does work now. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500.

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

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

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

2016-01-31 Thread kaputtnik
I also couldn't confirm the problem GunChleoc described. Here it works fine, but the lines in the wares statistic does not fit in the diagram. See https://bugs.launchpad.net/widelands/+bug/1531114/+attachment/4560624/+files/lines.png --

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

2016-01-31 Thread GunChleoc
Review: Approve code I find update annoying and difficult too, so I'm all for it. I expect that the added CPU load won't increase for long games, so I think we can afford the extra CPU time - the recent graphics changes have already saved a lot, so we'll still be better off than we were before

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

2016-01-31 Thread GunChleoc
No crashes now, but another bug in the general stats - looks like the assert wasn't that silly, maybe? https://launchpadlibrarian.net/235815511/stats_lines.png -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is

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

2016-01-31 Thread GunChleoc
I am already working on fixing up the codecheck rules so we can run clang-format, because it is annoying me too. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530124/+merge/284356 Your team Widelands Developers is subscribed to branch

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

2016-01-31 Thread GunChleoc
Review: Approve testing I have tested this now - everything seems ok. -- https://code.launchpad.net/~widelands-dev/widelands/remove_update/+merge/284524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_update.

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

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

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

2016-01-31 Thread GunChleoc
I have pulled the functions out. The for loop has to stay as it is, because I am referencing iterator.end(). -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525680.

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

2016-01-31 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr merge ../_widelands_dev_widelands_remove_update' failed. Output: M src/editor/ui_menus/editor_tool_menu.cc M src/graphic/graphic.cc M src/graphic/graphic.h M

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

2016-01-31 Thread SirVer
@bunnybot merge Diff comments: > > === modified file 'src/ui_basic/panel.cc' > --- src/ui_basic/panel.cc 2016-01-27 08:06:40 + > +++ src/ui_basic/panel.cc 2016-01-30 22:45:22 + > @@ -150,15 +147,9 @@ > > // Panel-specific startup code. This might call end_modal()! >

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

2016-01-31 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/remove_update into lp:widelands has been updated. Commit Message changed to: Removed graphic::update() and Panel::update() and always redraw at maxfps. Changed default maxfps to 30 (instead of 25). For more details, see:

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

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

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

2016-01-31 Thread SirVer
No, the assert was silly. I cannot reproduce this error - do you have a repro case? Is that always the problem, all the time? Or only sometimes? -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review

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

2016-01-31 Thread SirVer
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/remove_update/+merge/284524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_update. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2016-01-31 Thread GunChleoc
All I have to do is start a game, open the statistics window and wait. As soon as a line gets plotted, it gets a diagonal downwards left added to the end node. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested