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

2018-05-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 3428. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/373539945. Appveyor build 3233. State: success. Details:

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

2018-05-01 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3427. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/373538965. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1767187-preciousness/+merge/344803 Your

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

2018-05-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 3427. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/373538965. Appveyor build 3232. State: success. Details:

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

2018-05-01 Thread hessenfarmer
Review: Resubmit Ok now it looks good. I am happy now. just have a look at my new code -- https://code.launchpad.net/~widelands-dev/widelands/Economy_tutorial_fix/+merge/343770 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/Economy_tutorial_fix.

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

2018-05-01 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/objective-string-rules into lp:widelands. Commit message: changed an objective in empire02 to be consistent with the rest of the campaign Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1748855 in

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1767919-trainingsite-messages into lp:widelands

2018-05-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 3426. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/373538215. Appveyor build 3231. State: success. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1358880-ship-statistics into lp:widelands

2018-05-01 Thread kaputtnik
Finally we got this!!! Thanks GunChleoc :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1358880-ship-statistics/+merge/343293 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ships_optr. ___ Mailing

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

2018-05-01 Thread hessenfarmer
ok understood. But shouldn't the # be removed if there is a helptext defined? see inline comment Diff comments: > > === modified file > 'data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua' > --- data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-user-type into lp:widelands

2018-05-01 Thread Notabilis
Hm, well... Unfortunately its not easy to get it running, actually I am surprised you got that far. I had quite some trouble getting it compiled when I first tried to. What is missing in your case is a running relay server. Seems that the "documentation" is incomplete, sorry for that. You have

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1714681-multiplayer-tribe-team into lp:widelands

2018-05-01 Thread bunnybot
Continuous integration builds have changed state: Travis build 3425. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/373389863. Appveyor build 3230. State: success. Details:

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

2018-05-01 Thread GunChleoc
Our script to pick up Lua messages does not like it if there are translators' comments without translations. Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/productivity-string-fixes/+merge/344796 Your team Widelands Developers is requested to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-user-type into lp:widelands

2018-05-01 Thread GunChleoc
> So how to we get this into the offical server now? We leave that up to Notabilis. He knows how to do it :) Do not merge this branch, let him handle it, because it needs to be coordinated. -- https://code.launchpad.net/~widelands-dev/widelands/net-user-type/+merge/343754 Your team Widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-user-type into lp:widelands

2018-05-01 Thread Klaus Halfmann
Review: Approve review, compile Sorry I was unable to the get wlms server going: klaus$ ./go/bin/wlms 2018/05/01 10:07:50 No configuration found, using in-memory database 2018/05/01 10:07:50 Using 127.0.0.1 and fe80::1 as IP addresses of the relay 2018/05/01 10:07:50 Unable to connect to relay

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1714681-multiplayer-tribe-team into lp:widelands

2018-05-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1714681-multiplayer-tribe-team into lp:widelands. Commit message: Always update MultiPlayerPlayerGroup when a NoteGameSettings::Action::kUser notification is received This fixes a bug where players could still edit the tribe and