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

2015-05-09 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1442945 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1442945 in widelands: "Atlanteans ship construction much faster" https://bugs.launchpad.net/widelands/+bug/1442945 For more d

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

2015-05-09 Thread TiborB
Merged. Dont blame yourself, mathematically it was correct, if I have a time and not forget about it I will do some tests, because I am interested to know what exactly went wrong. Probably some idiosyncrecy of C++ :) I still think this branch fixed the bug, but I will test the trunk (now after

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

2015-05-09 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/militarysites_tweaks into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/militarysites_tweaks/+merge/255132 -- Your team Widelands Developers is subscr

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2015-05-09 Thread Hans Joachim Desserud
Somewhat relevant: Launchpad has now officially announced beta support for git code hosting, see http://blog.launchpad.net/general/git-code-hosting-beta for details. I saw this was discussed on reddit (https://www.reddit.com/r/Ubuntu/comments/34k8oi/git_code_hosting_beta_in_launchpad/) and one

Re: [Widelands-dev] [Merge] lp:~shevonar/widelands-website/django1.4 into lp:widelands-website

2015-05-09 Thread Hans Joachim Desserud
> Are you working on step 1? No. Sorry. :( As I mentioned briefly in the previous comment I never seem to get around to working on this. I guess partially because it's somewhat intimidating since I haven't used Django/South that much. This is also why I posted the comment, since I didn't knew

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

2015-05-09 Thread GunChleoc
Translator and developer credits now live in JSON files. They get parsed into Lua files by utils/update_authors.py Once this gets the go-ahead, we should hook the new Python script into utils/merge_and_push_translations.sh, so it will be called regularly. I will also need to set up the translat

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

2015-05-09 Thread GunChleoc
Review: Approve All fine now - sorry for messing things up. Please go ahead and merge :) I copied the new AI code over to an older version of trunk to test the crashing savegame linked in the bug - it still crashed. So, I have unlinked the bug report from this branch. If you want to still work