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

2014-10-28 Thread wl-zocker
There are still three "TODO(codereview)": campaigns/tutorial04_economy.wmf/scripting/helper_functions.lua -- TODO(codereview): this creates "1 soldier (+4)", but I want a capacity of 1 (i.e. "1 soldier") b:set_soldiers({0,0,0,0}, 1) Probably not possible. campaigns/tutorial04_economy.wmf/scripti

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/debian-sdl2-packages into lp:~widelands-dev/widelands/debian

2014-10-28 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/debian-sdl2-packages/+merge/239904 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/debian. ___ Mailing list: https://launchpad.net/~widelands-de

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/debian-sdl2-packages into lp:~widelands-dev/widelands/debian

2014-10-28 Thread SirVer
I believe that we should not need sdl_gfx anymore - we only used it for it's rotozoom implementation - and we did not use the roto part at all, only the zoom part. AFAIK sdl2 has methods for that now build in, so we can loose this dependency which would be nice. -- https://code.launchpad.net/~w

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

2014-10-28 Thread GunChleoc
Thanks for the fix. I'll merge this tomorrow. -- https://code.launchpad.net/~widelands-dev/widelands/new-tutorials/+merge/238682 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-tutorials. ___ Mailing list: https:/

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

2014-10-28 Thread Hans Joachim Desserud
>I can prepare a test build of this branch packaged with SDL2-packages. Built, installed tested. It just works(tm) https://code.launchpad.net/~widelands-dev/widelands/debian-sdl2-packages/+merge/239904 >Yes, no fallback for SDL. That is excessive maintenance. That's understandable. :) -- https

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/debian-sdl2-packages into lp:~widelands-dev/widelands/debian

2014-10-28 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/debian-sdl2-packages into lp:~widelands-dev/widelands/debian. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/debian-sdl2-packages/+merge/2

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

2014-10-28 Thread SirVer
Yes, no fallback for SDL. That is excessive maintenance. I am fine with retiring our 12.04 PPA, but I think we should hard delete it - not that people are expecting nightlies and we cannot deliver them - better to give them an error message then old packages. Please try to set up a PPA with th

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

2014-10-28 Thread SirVer
[compile.sh] > test -d build/locale || mkdir -p build/locale > test -e locale || ln -s build/locale I wasn't sure if this was done. That was exactly what I was thinking it needs to do in the future. So this does not need any change, agreed. Thanks for checking the arch sources too. Let's assume

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

2014-10-28 Thread SirVer
Review: Approve I found one bug: - secret_village.lua:17 attempt to call global send_msg, a nil value. I fixed it in 7251. I didn't look over all the code as Gun did that already. What I saw looked good (local variables by default mainly and consistent style). The campaigns and tutorials are

[Widelands-dev] [Merge] lp:~hjd/widelands/debian-revert-fonts into lp:~widelands-dev/widelands/debian

2014-10-28 Thread noreply
The proposal to merge lp:~hjd/widelands/debian-revert-fonts into lp:~widelands-dev/widelands/debian has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~hjd/widelands/debian-revert-fonts/+merge/238827 -- https://code.launchpad.net/~hjd/wideland

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

2014-10-28 Thread Hans Joachim Desserud
>all I care about in this case is tha I know where to drop my .po or .mo file. That's basically what I'm thinking too. :) And with this use case the option is not necessary because translations are still read from the same directory. >Also, what about compile.sh? Does it build locales? If so, we

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

2014-10-28 Thread Hans Joachim Desserud
Just to check, this makes Widelands SDL2-only, right? (No fallback to SDL1) I don't have any strong opinions on this, and it's probably ok since SDL2 is already available in the latest versions of most (all) distros. :) However, this means that we need to update the list of dependencies in the PP

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

2014-10-28 Thread GunChleoc
Don't worry, it is more likely anyway that any bugs will surface if somebody who hasn't worked on the code will test this. -- https://code.launchpad.net/~widelands-dev/widelands/new-tutorials/+merge/238682 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-tut

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

2014-10-28 Thread wl-zocker
Thank you for working on this. Unfortunally, I do not have much time, so I cannot test it now. -- https://code.launchpad.net/~widelands-dev/widelands/new-tutorials/+merge/238682 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-tutorials. ___

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

2014-10-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/SDL2 into lp:widelands. Requested reviews: SirVer (sirver) Related bugs: Bug #1380048 in widelands: "Port to SDL2" https://bugs.launchpad.net/widelands/+bug/1380048 For more details, see: https://code.launchpad.net/~widelands-dev/w

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

2014-10-28 Thread GunChleoc
Review: Approve I think we are done here. Could somebody please check my part of the code and do some additional playtesting? I still need to create the gettext catalog files, but I'll do that during the merge, so we won't use any translations. I will have to run msgmerge quite a lot ;) -- h

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

2014-10-28 Thread GunChleoc
Yes, compile.sh builds locales in the local tree. -- https://code.launchpad.net/~widelands-dev/widelands/reducing-paths/+merge/239645 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/reducing-paths into lp:widelands.

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

2014-10-28 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/i18nfixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/i18nfixes/+merge/238137 -- https://code.launchpad.net/~widelands-dev/widelands/i18nfixes/

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

2014-10-28 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1385859 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1385859/+merge/239705 -- https://code.launchpad.net/~widelands-dev/widelands/bug-13

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/debian-reduce-paths into lp:~widelands-dev/widelands/debian

2014-10-28 Thread SirVer
Review: Approve One nit. Otherwise lgtm. Diff comments: > === modified file 'debian/rules' > --- debian/rules 2014-10-19 10:55:07 + > +++ debian/rules 2014-10-25 17:22:19 + > @@ -14,12 +14,9 @@ > CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" > CXXFLAGS="

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/debian-revert-fonts into lp:~widelands-dev/widelands/debian

2014-10-28 Thread SirVer
Review: Approve looks good to me. -- https://code.launchpad.net/~hjd/widelands/debian-revert-fonts/+merge/238827 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/debian. ___ Mailing list: https://launchpad.net/~widela