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

2015-06-01 Thread TiborB
one small question in the diff. Otherwise it looks good, but I have not tested it. Diff comments: > === modified file 'campaigns/emp01.wmf/scripting/init.lua' > --- campaigns/emp01.wmf/scripting/init.lua2014-10-02 17:05:38 + > +++ campaigns/emp01.wmf/scripting/init.lua2015-05-31 14:3

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

2015-06-01 Thread GunChleoc
Thanks :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1459529/+merge/260632 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1459529. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

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

2015-06-01 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1459529 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1459529/+merge/260632 -- Your team Widelands Developers is subscribed to branch lp

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

2015-06-01 Thread wl-zocker
Answer in the diff. Diff comments: > === modified file 'campaigns/emp01.wmf/scripting/init.lua' > --- campaigns/emp01.wmf/scripting/init.lua2014-10-02 17:05:38 + > +++ campaigns/emp01.wmf/scripting/init.lua2015-05-31 14:39:04 + > @@ -11,6 +11,5 @@ > > p1 = wl.Game().players[1]

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

2015-06-01 Thread TiborB
see replay Diff comments: > === modified file 'campaigns/emp01.wmf/scripting/init.lua' > --- campaigns/emp01.wmf/scripting/init.lua2014-10-02 17:05:38 + > +++ campaigns/emp01.wmf/scripting/init.lua2015-05-31 14:39:04 + > @@ -11,6 +11,5 @@ > > p1 = wl.Game().players[1] > > -in

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

2015-06-01 Thread TiborB
Just curious, update_authors.py will be run everytime on compile or somebody should run it after editing json file and push the result to a current branch? -- https://code.launchpad.net/~widelands-dev/widelands/authors/+merge/250513 Your team Widelands Developers is requested to review the propos

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

2015-06-01 Thread GunChleoc
It's sufficient to run it when a change in the json files has taken place. My plan is to add it to merge_and_push_translations.py, this will make it frequent enough. No need to add it to the compile script. -- https://code.launchpad.net/~widelands-dev/widelands/authors/+merge/250513 Your team Wi

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

2015-06-01 Thread wl-zocker
If the player destroys the quarry construction site, he is not allowed to rebuild it. I see three possibilities: - Allow the user to rebuild the quarry. This would mean to redefinitions of immovable_is_legal() inside the while loop, which makes the code quite messy. - Send a message to the user

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

2015-06-01 Thread TiborB
But now, the inner loop will "loop" forever and player will not know what is going on - do I understand it correctly? I think player should receive an message he had messed things up and he should restart or reload the game. -- https://code.launchpad.net/~widelands-dev/widelands/tutorial-improv

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

2015-06-01 Thread wl-zocker
I changed it according to your suggestion. The bug that the game would not continue, has been in there before these changes, and I have heard of no complaint. Please test it. Maybe GunChleoc should have a look on the strings before merging. I requested her review. -- https://code.launchpad.net

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

2015-06-01 Thread Hans Joachim Desserud
Re-reading my previous comment, I guess I should mentioned that I'm not really opposed to the CC-license. It's a nice useful license, and I realize we should probably discuss more at a later time whether to include CC-BY-SA-licensed artwork or otherwise... The unfortunate problem is that I don

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

2015-06-01 Thread GunChleoc
> The unfortunate problem is that I don't think we can legally relicense the > existing graphics without getting permission from the creators yes, this is what everybody says, and it makes sense too > which means one set of graphics would be covered by one license and another set under a differ

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

2015-06-01 Thread GunChleoc
Review: Needs Fixing I have added some suggestions for the strings, and 1 for the code. I haven't tested anything yet. Diff comments: > === modified file 'campaigns/emp01.wmf/scripting/init.lua' > --- campaigns/emp01.wmf/scripting/init.lua2014-10-02 17:05:38 + > +++ campaigns/emp01.wmf/

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

2015-06-01 Thread TiborB
"I have heard of no complaint" - I believe this, there are probably a lot of such corner cases in tutorials, but no harm is done when you think also about this. I just left one comment in the diff. Otherwise it LGTM (and yes, I tested it of course) I presume GunChleoc will look at this yet and

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

2015-06-01 Thread wl-zocker
Thank you both for you input. I am waiting for your approval now. -- https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tutorial-improvements into lp:widela

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

2015-06-01 Thread TiborB
It is OK for me... -- https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands. _