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

2016-03-28 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: 'ascii' codec can't decode byte 0xe2 in position 27: ordinal not in range(128) -- https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704 Your team Widelands Developers is subscribed to branch lp:~wideland

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

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

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands

2016-03-28 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1556218-escape-characters/+merge/290191 -- Your team Widelands De

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

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

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

2016-03-28 Thread TiborB
Oh wait a bit, I forgot to add new value into game save/load code. (And break save compatibility again :) ) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1554552/+merge/289830 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1554552. __

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

2016-03-28 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/revised_maps. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2016-03-28 Thread GunChleoc
Yes, the issue is not new. Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/scrollbar_fixes/+merge/290133 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/scrollbar_fixes into lp:widelands. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands

2016-03-28 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1556218-escape-characters/+merge/290191 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1556218-escape-characters. ___ Mailing list: https

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

2016-03-28 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/options_spinbox_cleanups/+merge/290192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/options_spinbox_cleanups. ___ Mailing list: https:

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

2016-03-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 900. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/118951127. Appveyor build 732. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_options_spinb

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

2016-03-28 Thread Miroslav Remák
Review: Approve Hmm, my config reset after trying this branch, but I am unable to reproduce it. Most likely not related to these changes, though. Code LGTM, tested and works fine. -- https://code.launchpad.net/~widelands-dev/widelands/options_spinbox_cleanups/+merge/290192 Your team Widelands D

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

2016-03-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 898. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/118948396. Appveyor build 730. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_about-730. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands

2016-03-28 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1556218-escape-characters/+merge/290191 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1556218-escape-characters. ___ Mailing list

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

2016-03-28 Thread TiborB
OK, so this fixes some issues, and does not create new ones? Then I am fine with this... -- https://code.launchpad.net/~widelands-dev/widelands/scrollbar_fixes/+merge/290133 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/scrollbar_fixes in

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

2016-03-28 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: 'ascii' codec can't decode byte 0xe2 in position 27: ordinal not in range(128) -- https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704 Your team Widelands Developers is subscribed to branch lp:~wideland

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

2016-03-28 Thread GunChleoc
I agree, let's merge this. This will give us a higher chance that somebody will encounter any bugs. I also tested Trident of Fire, which is working fine :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704 Your team Widelands Developers is subscri

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

2016-03-28 Thread Klaus Halfmann
Review: Approve playing OK, I tried (got tired) of the nile, I think we should merrge this now. Next time we should do this for single maps only. I check some code, but not all, as I have no Idea what to check for. So lets get his merged so we can check for single problems/bugs later. If there a

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

2016-03-28 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1562071-rendering_issues into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1562071-rendering_issues/+merge/290183 -- Your team Widelands Deve

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

2016-03-28 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562071-rendering_issues/+merge/290183 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1562071-rendering_issues. ___ Mailing list: https:/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands

2016-03-28 Thread GunChleoc
OK, updating eris doesn't help - the bug is somewhere else. -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. ___ Mai

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands

2016-03-28 Thread SirVer
Updating eris will invalidate all savegames Most likely though. > Am 28.03.2016 um 12:55 schrieb GunChleoc : > > Yes, we could try that. Good idea :) > -- > https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 > You are subscribed to branch lp:widelands. -- https:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands

2016-03-28 Thread GunChleoc
Yes, we could try that. Good idea :) -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. ___ Mailing list: https://laun

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

2016-03-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/options_spinbox_cleanups into lp:widelands. Commit message: Options and Spinbox cleanups: - Reversed semantics of "Do not zip" checkbox. - More intelligent handling of units in spinboxes. Requested reviews: Widelands Developers (widela

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands

2016-03-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands. Commit message: Replaced "\\< ... \\>" with "< ... >" Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1556218 in widelands: "Escape characters visible to the

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

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

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

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

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

2016-03-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 894. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/118530907. Appveyor build 726. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_scrollbar_fix

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

2016-03-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 895. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/118540165. Appveyor build 727. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_draw_rect_mis

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

2016-03-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 896. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/118652618. Appveyor build 728. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1540827-7

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands

2016-03-28 Thread kaputtnik
What about bug 1543001 (update eris)? Is it sure that this bug isn't already in trunk somewhere? -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands

2016-03-28 Thread GunChleoc
The problem is triggered in the line std::unique_ptr table(lua_->run_script(entry.script_path)); and the crash happens somewhere in eris. I have no idea why. I tried all kinds of things, and I'm out of ideas. -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/2897

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

2016-03-28 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562071-rendering_issues/+merge/290183 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1562071-rendering_issues. ___ Mailing list

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

2016-03-28 Thread GunChleoc
Yes, this is what I meant by "We still need to do something about The Nile, but I'd rather do that in a separate branch, so we won't lose the test case here." ;) There are 2 possible solution: 1. Get the new font renderer working, so we can have a big multilinetextarea for pretty much everythi

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

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

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

2016-03-28 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/draw_rect_missing_pixel/+merge/290141 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/draw_rect_missing_pixel. ___ Mailing list: https://launchpad