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

2016-01-30 Thread GunChleoc
Added some comments. IMO the best way to solve the tabs issue is to run clang-format over the whole codebase and remove the conflicting codecheck rules. I just tend not to run clang-format ATM, because it makes the diff big. Diff comments: > > === modified file 'src/graphic/text_layout.cc' >

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

2016-01-30 Thread kaputtnik
> Yes, the naming is based on the source code, fs = fullscreen in this case. If > we rename anything here, it should be done both in the source code and the > images - naming should be identical. I could only say for the folder images and for graphical development. And i believe it isn't possib

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

2016-01-30 Thread SirVer
how about: ui_sfmenu -> widelands/ui/menus wui -> widelands/ui/game/ editor/*all_ui_stuff/ -> widelands/ui/editor/ This would move us (further) towards separating non-widelands dependant stuff and widelands dependant stuff? I wonder if that should done in a separate PR though, because this is

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

2016-01-30 Thread kaputtnik
Review: Approve functionality Yes, finetuning of folders could be done in a separate branch. This could also be targeted to build 20 i think. I have tested now also different datadirs and all works fine. Also did a test merge to trunk ... all fine. No compiler errors here. So the only thing to

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

2016-01-30 Thread GunChleoc
+1 for finetuning the file structure later. I have added SirVer's idea to the bug. -- 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/beautiful_correct_lines into lp:widelands

2016-01-30 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/beautiful_correct_lines into lp:widelands. Commit message: Fixes line drawing by replacing the broken use of GL_LINES with a tessellation algorithm for drawing lines. We are drawing a line segment as two triangles. The width of the lines i

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

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

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

2016-01-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 448. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/105892159. Appveyor build 345. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_beautiful_co

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

2016-01-30 Thread GunChleoc
I got an error running the Appveyor build - see screenshot: https://bugs.launchpad.net/widelands/+bug/1531114/comments/4 1 tiny code style consistency nit. Diff comments: > > === modified file 'src/wui/plot_area.cc' > --- src/wui/plot_area.cc 2016-01-28 21:27:04 + > +++ src/wui/plot_a

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

2016-01-30 Thread SirVer
I introduced the crash during cleanup, should have tested again. Nit and crash is fixed. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/beautiful_

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

2016-01-30 Thread SirVer
travis has caught that too while running the regression suite :). Seems stuff is working nicely. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/be

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

2016-01-30 Thread GunChleoc
I am getting another crash. To reproduce, start a new game and click on general statistics. ComputerPlayer(2): initializing (2) Forcing flag at (43, 59) Message: adding (wh) (warehouse) 1 Forcing flag at (42, 21) Message: adding (wh) (warehouse) 2 Font file not found. Falling back to serif: con

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

2016-01-30 Thread SirVer
I think you are right about the nodes - they will not get broken apart IMHO. About the moribund question - right now the code is used in two places, who knows how long it takes us to get rid of richtext.cc, maybe it is around for years again and then we have the code to maintain in two places. I

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

2016-01-30 Thread SirVer
Review: Approve > IMO the best way to solve the tabs issue is to run clang-format over the > whole codebase and remove the conflicting codecheck rules. Amen to that. We should do that. lgtm, feel free to merge whenever. Diff comments: > > === modified file 'src/graphic/wordwrap.cc' > --- sr

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

2016-01-30 Thread SirVer
That assert was just plain silly. Fixed. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/beautiful_correct_lines into lp:widelands. ___

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

2016-01-30 Thread SirVer
Review: Approve I just tested this on Mac OS X and made a slight adaptation to the build script we use. This is ready to go IMHO. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/b

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

2016-01-30 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/remove_update into lp:widelands. Commit message: Removed graphic::update() and Panel::update() and always redraw at maxfps. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1395630 in widelands: "Remove maxfp

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

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

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

2016-01-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 451. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/105933176. Appveyor build 348. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_beautiful_co

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

2016-01-30 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: HTTP Error 500: Internal Server Error -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/wid

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

2016-01-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 451. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/105933176. Appveyor build 348. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_beautiful_co

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

2016-01-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 453. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/105948529. Appveyor build 350. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_remove_update