[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp:widelands

2019-04-07 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp:widelands. Commit message: Filter wares' producers and consumers for the tribe in the Lua interface. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1823467 i

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

2019-04-07 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. Commit message: Moved main files into folder mainpage Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1762164 in Widelands Website: "Update website code to u

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

2019-04-07 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/llvm8 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/llvm8/+merge/365635 Update the travic config to build with Clang (LLVM) 8 which was re

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

2019-04-07 Thread kaputtnik
Looks like it works fine on alpha. -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. _

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

2019-04-07 Thread Benedikt Straub
Uploaded the changes discussed in the bug report. Ferries can now travel along any edge where both adjacent triangles are navigable terrain. I cleaned up the economy code, removed lots of duplicate functionality for wares and workers, and fixed a bug in worker creation. If you have two road netw

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp:widelands

2019-04-07 Thread bunnybot
Continuous integration builds have changed state: Travis build 4675. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516790028. Appveyor build 4461. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_182346

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

2019-04-07 Thread bunnybot
Continuous integration builds have changed state: Travis build 4677. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/516803942. Appveyor build 4463. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_llvm8-4463. -- http

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

2019-04-07 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/territorial_game_over into lp:widelands. Commit message: In territorial, don't set players into spectator mode when game over condition is met. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https:/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp:widelands

2019-04-07 Thread hessenfarmer
Review: Approve test and review code looks good. Have tested the appveyor build. works for the reported bug as weel as for the frisian counterpart. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1823467-trainingsites-dependencies/+merge/365633 Your team Widelands Dev

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

2019-04-07 Thread Klaus Halfmann
I played the first 3 Tutorial on this branhc and everyhting was fine. When hanging around in the config I get > Songset: Loaded song "music/menu_00.ogg" again and again, is this intended, or should this happen only once I will try to do a code review. But this seems to be a _bigger_ task :-) --

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

2019-04-07 Thread hessenfarmer
Review: Approve +1 from my side. but I would let it to Gunchleoc to decide whether this should go into b20 or b21. -- https://code.launchpad.net/~widelands-dev/widelands/territorial_game_over/+merge/365636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/territ

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands

2019-04-07 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands. Commit message: This is for b21. A lot of lore texts added according to the relevant forum discussions Requested reviews: Widelands Developers (widelands-dev) For more details, see: htt

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp:widelands

2019-04-07 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1823467-trainingsites-dependencies/+merge/365633 -- You

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-07 Thread Benedikt Straub
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/editor-resize-map into lp:widelands. Commit message: Add an editor tool to change the map size Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1218373 in widelands: "Feature to change map size (x / y)

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

2019-04-07 Thread bunnybot
Continuous integration builds have changed state: Travis build 4681. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516876480. Appveyor build 4467. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_territoria

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands

2019-04-07 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands. Commit message: fixes bug 1823471 this is for b21 Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1823471 in widelands: "Empire 3 +4 victory messages are

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

2019-04-07 Thread bunnybot
Continuous integration builds have changed state: Travis build 4682. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/516878831. Appveyor build 4468. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-446

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands

2019-04-07 Thread bunnybot
Continuous integration builds have changed state: Travis build 4683. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516906606. Appveyor build 4469. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_176431

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands

2019-04-07 Thread GunChleoc
Review: Approve Code LGTM. Not tested. -- https://code.launchpad.net/~widelands-dev/widelands/bug1823471-empire3-4-victory/+merge/365640 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1823471-empire3-4-victory. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp:widelands

2019-04-07 Thread GunChleoc
Thanks for the review and testing :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1823467-trainingsites-dependencies/+merge/365633 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1823467-trainingsites-dependencies.

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

2019-04-07 Thread GunChleoc
Review: Approve Tested and working :) Just 1 small nit for the English language. Diff comments: > === modified file 'README.txt' > --- README.txt2018-12-30 11:45:03 + > +++ README.txt2019-04-07 10:02:44 + > @@ -125,60 +126,63 @@ > See also > https://docs.djangoproject.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-07 Thread bunnybot
Continuous integration builds have changed state: Travis build 4685. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/516924316. Appveyor build 4471. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_re

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

2019-04-07 Thread kaputtnik
Thanks, all fixed, also the smiley thing(s). I'll do the merge eventually this evening. -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is subscribed to branch lp:widelands-website.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1823612-llvm8-build-errors into lp:widelands

2019-04-07 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1823612-llvm8-build-errors into lp:widelands. Commit message: Fix compile errors for clang 8. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1823612 in widelands: "Widelands fails to build with LLVM 8"

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

2019-04-07 Thread GunChleoc
That message should come up every time that the song finishes playing and starts again. Yep, definitely a big code review. Probably best do it with a diff program like Meld and add your remarks as NOCOM comments to the code. I'll merge trunk now to make the diff smaller. -- https://code.launch

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

2019-04-07 Thread GunChleoc
Review: Approve Let's have it - this looks non-critical. Thanks for the fix! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/territorial_game_over/+merge/365636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/territorial_game_over.