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

2018-04-23 Thread GunChleoc
Only do this change if you like it yourself - I think it sounds less poetic, and Hessenfarmer & I don't agree on the issue. You're the author, so let's make you the arbiter. Keep in mind that this is a flavor text and not an instruction to the player. Frisians would get the joke without "honey"

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

2018-04-23 Thread GunChleoc
Stared proofreading. A bit cumbersome, since I can't hack on the code directly right now :( Diff comments: > > === modified file 'data/campaigns/tutorial04_economy.wmf/scripting/texts.lua' > --- data/campaigns/tutorial04_economy.wmf/scripting/texts.lua 2018-01-18 > 08:26:38 + > +++ data/ca

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1743086-sdl-sound-bug-workaround into lp:widelands

2018-04-23 Thread GunChleoc
Thanks for testing! :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1743086-sdl-sound-bug-workaround/+merge/343764 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1743086-sdl-sound-bug-workaround into lp:w

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

2018-04-23 Thread GunChleoc
Can you please document the metaserver option in a separate branch? This is where it should go: https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/wlapplication_messages.cc -- https://code.launchpad.net/~widelands-dev/widelands/net-user-type/+merge/343754 Your team Widela

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-online-game-status into lp:widelands

2018-04-23 Thread GunChleoc
Review: Approve What about while the game is loading? "Running" might be sufficient though, I haven't thought this through. Code LGTM -- https://code.launchpad.net/~widelands-dev/widelands/net-online-game-status/+merge/343768 Your team Widelands Developers is subscribed to branch lp:~widelands

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

2018-04-23 Thread Benedikt Straub
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/campaign_data into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/campaign_data/+merge/343783 Adds two Lua functions save_campaign

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1743086-sdl-sound-bug-workaround into lp:widelands

2018-04-23 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1743086-sdl-sound-bug-workaround into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1743086-sdl-sound-bug-workaround/+merge/343764 -- Your te

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

2018-04-23 Thread GunChleoc
I think this would benefit greatly from having proper data structures rather than using a string https://wl.widelands.org/forum/topic/4228/?page=2#post-24594 Let me know if you need any help with the Lua tables in the C++ backend - they are a bit tricky and I usually find a similar function and

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

2018-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 3403. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/369988831. Appveyor build 3209. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_campaign_d

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

2018-04-23 Thread hessenfarmer
Read your comments so far. They will be implemented tonight. Just give me a hint when you are finished. Sorry for my grammar. I even can't set the commas in German. Regarding tone and language I tried to be in line with the rest of the tutorial. Hope it seems ´to be ok for you. Thanks for the fi

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

2018-04-23 Thread hessenfarmer
Thinking as scenario designer I would prefer to have the string solution. Because if there is a fixed format and I Need just one single value in the next Scenario I would have to write a lot of Zeros to the file, additionally there is more information in a Scenario than is contained in the lua t

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

2018-04-23 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/clang-6.0 into lp:widelands. Commit message: Replaced clang-4.0 with clang-6.0. Let's see how Travis responds. :) Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1766069 in widelands: "Update travis.yml w

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

2018-04-23 Thread Notabilis
Oh! I wasn't aware that this isn't documented. Thanks for the pointer, I will do so. -- https://code.launchpad.net/~widelands-dev/widelands/net-user-type/+merge/343754 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-user-type. _

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

2018-04-23 Thread Benedikt Straub
I could try to implement the table solution without fixed formats. So you pass a table to the save function, but it is up to you what keys to specify, and the .wcd file will contain only the keys you chose to use, with the values you assigned to them. For example, you could call local decision

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-online-game-status into lp:widelands

2018-04-23 Thread Notabilis
"Loading" and "hanging" (due to network lags) were some further states I considered. But they are both (hopefully) quite short states and the interaction possibilities for other users are the same as for "running". Loading could take some time, but it should/might be possible to code the host i

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

2018-04-23 Thread kaputtnik
The bot is maybe a holdover from the time ggz was used? http://www.ggzgamingzone.org -- https://code.launchpad.net/~widelands-dev/widelands/net-user-type/+merge/343754 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-user-type.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/document-metaserver-option into lp:widelands

2018-04-23 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/document-metaserver-option into lp:widelands. Commit message: Documenting metaserver command line option. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelan

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

2018-04-23 Thread Hans Joachim Desserud
The proposal to merge lp:~hjd/widelands/clang-6.0 into lp:widelands has been updated. Commit message changed to: Replaced clang-4.0 with clang-6.0. Let's see how Travis responds. :) Seems to be working https://travis-ci.org/widelands/widelands/builds/370207384 For more details, see: https://co

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

2018-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 3405. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/370207384. Appveyor build 3211. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_clang_6_0-3211. --

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-online-game-status into lp:widelands

2018-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 3406. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/370208637. Appveyor build 3212. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_net_online

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/document-metaserver-option into lp:widelands

2018-04-23 Thread bunnybot
Continuous integration builds have changed state: Travis build 3407. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/370237271. Appveyor build 3213. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_document_me

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

2018-04-23 Thread hessenfarmer
As we don't fully agree on the issue regarding the honey. We do fully agree on the matter that you should just implement things you are happy with. Generally spoken: If you have something implemented intentionally I would be happy with the explanation as well instead of having things changed. --