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

2016-01-28 Thread kaputtnik
The wrong building of the path appears also on linux. See diff comment. With this change all works fine, imho. Haven't tested all use cases yet. Diff comments: > > === modified file 'CMakeLists.txt' > --- CMakeLists.txt2016-01-23 12:42:00 + > +++ CMakeLists.txt2016-01-28 17:26:34 +0

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

2016-01-28 Thread GunChleoc
We have updated Together We're Strong because of the artifacts, so you will need to grab the map from Build 18. I actually want to take a different approach to this: Rather than putting the compatibility code back in, only load needed packages in the editor. So, this branch is now only sitting

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

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

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

2016-01-28 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/ui_align/+merge/284353 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ui_align. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

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

2016-01-28 Thread SirVer
Review: Needs Information Is there a way I can trigger the bug this is trying to fix in trunk? Together we're strong loaded just fine in the editor for me and so did every other shipped map I tried. -- https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088 Your team

Re: [Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands

2016-01-28 Thread SirVer
nevermind, the codecheck warning was already in trunk. I wonder if I should change bunnybot to not merge until travis is green. @bunnybot merge -- https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-ui_fsmenu/+merge/284339 Your team Widelands Developers is requested to review the

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

2016-01-28 Thread SirVer
lgtm. I fixed the trunk codecheck warning. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ui_align/+merge/284353 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ui_align into lp:widelands. __

Re: [Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands

2016-01-28 Thread SirVer
travis is reporting codecheck warnings, otherwise lgtm. Please fix them before merging. Klaus, as a aside: would you help out with reviewing other merge requests reviews? I also added you to widelands-dev now, so you can also push to ~widelands-dev instead of your username which allows other de

[Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands

2016-01-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 435. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/105514919. Appveyor build 333. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_klaus_halfmann_widelands_bug_1395278

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

2016-01-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 434. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/105474727. Appveyor build 332. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-3

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

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

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

2016-01-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1530124 into lp:widelands. Commit message: - Fixed crash with richtext font renderer for filenames that contain in Table, MultilineTextarea and EditBox. - EditBox now uses the new font renderer. - Fixed a crash in SpinBox. Requeste

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

2016-01-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/ui_align into lp:widelands. Commit message: UI::Align is now an enum class. Got rid of align aliases in UI::Box. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1367725 in widelands: "Consistent naming of e

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

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

Re: [Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands

2016-01-28 Thread GunChleoc
Code LGTM - just 1 nit: get_y_fropreceding_ => get_y_from_preceding. I have marked 2 instances with diff comments. Diff comments: > > === modified file 'src/ui_fsmenu/campaign_select.cc' > --- src/ui_fsmenu/campaign_select.cc 2015-10-23 18:03:33 + > +++ src/ui_fsmenu/campaign_select.cc 20

[Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands

2016-01-28 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu mirrored to https://github.com/widelands/widelands/tree/_klaus_halfmann_widelands_bug_1395278_ui_fsmenu You can give me commands by starting a line with @

[Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands

2016-01-28 Thread Klaus Halfmann
Klaus Halfmann has proposed merging lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-ui_fsmenu/+merge/284339 Migration from m_..

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

2016-01-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 434. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/105474727. Appveyor build 332. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-3

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

2016-01-28 Thread GunChleoc
I had a look at http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1397500/view/head:/utils/win32/mingw/config.h and I don't know if the . in the datadir needs removing or something. SInce I can't test on Windows, it's hard for me to play with stuff. The variable that needs setting is dat

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

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

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

2016-01-28 Thread GunChleoc
Review: Approve LGTM @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/load_library/+merge/284218 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/load_library. ___ Mailing list: https://launchpa

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

2016-01-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 424. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/105353758. Appveyor build 324. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_load_library

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

2016-01-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 426. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/105358644. Appveyor build 326. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-

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

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

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

2016-01-28 Thread kaputtnik
Review: Approve Works well :-) This is a really good change. Thanks a lot for this. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/padding_in_atlas. __

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

2016-01-28 Thread SirVer
Whatever is easier for you. -- https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/padding_in_atlas. ___ Mailing list: https://launchpad.n

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

2016-01-28 Thread kaputtnik
I am just compiling... If this fixes the problem i want to change the road pics to have them all a width of 10 pixel. Could i change them in this branch or should i make another branch for this? -- https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 Your team Widel