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

2016-02-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 728. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110073992. Appveyor build 575. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_codecheck_bra

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

2016-02-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 733. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110196319. Appveyor build 580. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-

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

2016-02-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 727. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109980041. Appveyor build 574. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_find_portdoc

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

2016-02-18 Thread kaputtnik
What is the state of affairs? Just asking :-) -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ M

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

2016-02-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 599. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/107486138. Appveyor build 461. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes

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

2016-02-18 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Various string fixes: - Added localization marker for production program names - Fixed stone -> granite in Atlantean campaign - Fixed grammar in Empire campaign - Correct use of Unicode elli

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

2016-02-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 725. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109937395. Appveyor build 572. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_listselect-5

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

2016-02-18 Thread GunChleoc
Review: Approve All done. Please double-check my code changes and wait for Travis before merging. -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_small_tweaks. ___

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

2016-02-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 724. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/109905228. Appveyor build 571. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1542705-

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

2016-02-18 Thread TiborB
For me it does not make a significant difference, it is not much of work. But if you fixed it all, you could merge it before I am back. It is up to you... -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 Your team Widelands Developers is subscribed to branch l

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

2016-02-18 Thread GunChleoc
Maybe we could show a message to indicate the error somehow? -- https://code.launchpad.net/~widelands-dev/widelands/network-memory/+merge/286162 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/network-memory into lp:widelands. _

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

2016-02-18 Thread GunChleoc
I could take care of splitting the ai_hintsh/.cc, since I'm waiting for a bunch of reviews anyway :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_small_tweaks. _

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

2016-02-18 Thread TiborB
OK, I will rework it, but not until next week. BTW, you are really right with your comments... -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_small_tweaks. ___

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

2016-02-18 Thread GunChleoc
Review: Needs Fixing I have fixed up some data types and added some NOCOMs. -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_small_tweaks. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-18 Thread GunChleoc
I haven't been able to figure out why the \ disappear. I still think that we should merge this though, because that's better than a crash. I have added a TODO comment to the code. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546153-suggested-teams into lp:widelands

2016-02-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 723. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109900878. Appveyor build 570. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1546153_

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

2016-02-18 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/codecheck-braces into lp:widelands. Commit message: Added a codecheck rule to require a space before opening braces. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-