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

2018-01-18 Thread kaputtnik
Another round of proofreading. Sorry for being so nitpicking... Comments in the code. Diff comments: > > === added file 'media/css/scheduling.css' > --- media/css/scheduling.css 1970-01-01 00:00:00 + > +++ media/css/scheduling.css 2018-01-17 19:07:26 + > @@ -0,0 +1,230 @@ > +/* Main *

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2018-01-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 3068. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/329830899. Appveyor build 2875. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1731

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2018-01-18 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3068. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/329830899. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1731652-worker-plant-attribute/+merge/

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

2018-01-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 3065. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/329644718. Appveyor build 2872. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_irc_users

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

2018-01-18 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3065. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/329644718. -- https://code.launchpad.net/~widelands-dev/widelands/irc_users/+merge/335898 Your team Wideland

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands

2018-01-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 3066. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/329757268. Appveyor build 2873. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bugfix_em

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

2018-01-18 Thread kaputtnik
Thanks :-) Looks better now. I did a first round of proofreading and added some comments, mainly nits. I am not sure if we should show the 'Scheduling' in the main menu, which has already many entrys. Since both links in that view needs logging in, i think showing 'Scheduling' should also be o

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

2018-01-18 Thread kaputtnik
I have tested in english. The language shouldn't matter, as long the language has no special cases, imho. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial4.

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

2018-01-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 3064. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/329644089. Appveyor build 2871. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_tutori

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

2018-01-18 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3064. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/329644089. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial1/+merge/336054 Your team Widel

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

2018-01-18 Thread kaputtnik
Oops, didn't test the objectives and there was one issue. In the 'Open the Ware Stastics window' part was a useless paragraphdivider(). I removed it and all looks good now. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subsc

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

2018-01-18 Thread Klaus Halfmann
Test this with ./wideland --scenario=/widelands-repo/fh1-tutorial4/data/campaigns/tutorial04_economy.wmf/ kaputtnik: Did you test in English or in German? I will then test the other variant. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands

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

2018-01-18 Thread kaputtnik
Review: Approve testing Tested with the fh1-tutorial2 branch and all LGTM :-) -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial4. ___