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

2014-01-14 Thread GunChleoc
I haven't looked closely at this, but it seems to have fixed the VICTORY/NEW OBJECTIVES headlines in campaing texts. This is correct. I have overhauled the code in all the tutorial campaigns, taking the Atlanteans as a blueprint. --

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

2014-01-15 Thread GunChleoc
If we merge this soon after the next build release, we could retrieve the translations from the build tag. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of

Re: [Widelands-dev] [Merge] lp:~gunchleoc/widelands/smugglers-i18n into lp:~widelands-dev/widelands/gci18nfixes

2014-02-10 Thread GunChleoc
://code.launchpad.net/~gunchleoc/widelands/smugglers-i18n/+merge/205496 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gci18nfixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net

Re: [Widelands-dev] [Merge] lp:~gunchleoc/widelands/smugglers-i18n into lp:~widelands-dev/widelands/gci18nfixes

2014-02-12 Thread GunChleoc
computers though, so I don't know how the IP addressing would work. I'm a networking numpty :P -- https://code.launchpad.net/~gunchleoc/widelands/smugglers-i18n/+merge/205496 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gci18nfixes

Re: [Widelands-dev] [Merge] lp:~gunchleoc/widelands/smugglers-i18n into lp:~widelands-dev/widelands/gci18nfixes

2014-02-15 Thread GunChleoc
Magic :) We can scrap this branch now, I'll do the changes in gci18nfixes. -- https://code.launchpad.net/~gunchleoc/widelands/smugglers-i18n/+merge/205496 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gci18nfixes

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

2014-02-28 Thread GunChleoc
P.S: I also noticed than when I merge from trunk to my branch, some of the texts I proofread are reverted to the previous version. I will will also have to mantually diff everything. after the merge. The general rules for the merge conflicts that bazaar flags up are this: - Ignore the po/pot,

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

2014-03-01 Thread GunChleoc
Sound like that is the reason then. I just tried and can't compile trunk either. I decided to do a full manual diff, because the automated merge killed some of my string changes. I'll do my best not to kill your bformat and ngettext Lua functions :) --

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

2014-03-01 Thread GunChleoc
So did my best to merge trunk. All uncompiled and untested. Also, the .pot catalogs etc. will need to be rebuilt. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of

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

2014-03-03 Thread GunChleoc
Do you have any ideas how to get rid of the added/removed/deleted conflicts? I did a full manual merge and now bzr wants to track something somewhere and is generating these conflicts. I tried saving my work, doing a bzr merge and then copying my files over, but then I get the same conflicts

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

2014-03-04 Thread GunChleoc
After I could compile and test, this is the stuff that still needs looking into: === /test/maps/expedition.wmf/scripting/init.lua - upper or lowercase needed here? wait_for_message(Expedition Ready) wait_for_message(Port Space Found)

[Widelands-dev] [Merge] lp:~gunchleoc/widelands/i18n-20140406 into lp:widelands

2014-03-06 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/i18n-20140406 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~gunchleoc/widelands/i18n-20140406/+merge/209788 Another minifix ;) -- https://code.launchpad.net

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

2014-03-08 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-1289586 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1289586 in widelands: Let tree descriptions use the same size scheme as buildings https://bugs.launchpad.net/widelands/+bug

[Widelands-dev] [Merge] lp:~gunchleoc/widelands/i18n-20140308 into lp:widelands

2014-03-09 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/i18n-20140308 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~gunchleoc/widelands/i18n-20140308/+merge/210081 Some more string fixes -- https

Re: [Widelands-dev] [Merge] lp:~mquinson/widelands/cleanup-MilitarySiteDesc into lp:widelands

2014-03-09 Thread GunChleoc
Thanks for cleaning up after me :) -- https://code.launchpad.net/~mquinson/widelands/cleanup-MilitarySiteDesc/+merge/210080 Your team Widelands Developers is requested to review the proposed merge of lp:~mquinson/widelands/cleanup-MilitarySiteDesc into lp:widelands.

[Widelands-dev] [Merge] lp:~gunchleoc/widelands/fix-codechecks into lp:widelands

2014-03-09 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/fix-codechecks into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~gunchleoc/widelands/fix-codechecks/+merge/210082 Just some code feng shui, no changes

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

2014-03-09 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-1278583 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1278583 in widelands: build completion status not translated https://bugs.launchpad.net/widelands/+bug/1278583 For more details

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

2014-03-09 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-961526 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #961526 in widelands: Articles and %s https://bugs.launchpad.net/widelands/+bug/961526 For more details, see: https

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

2014-03-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-999262 into lp:widelands. Requested reviews: SirVer (sirver) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-999262/+merge/210166 All resource names are now localized in Out of resources messages

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

2014-03-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1290073 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1290073 in widelands: Training grounds description vs Warrior's axe description https://bugs.launchpad.net/widelands/+bug

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

2014-04-03 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-1299919 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1299919 in widelands: AT: %1$u/%2$u in miltary sites https://bugs.launchpad.net/widelands/+bug/1299919 For more details, see

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

2014-04-08 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1300724 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1300724 in widelands: Minor string issues https://bugs.launchpad.net/widelands/+bug/1300724 For more details, see: https

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

2014-04-09 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1290070 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1290070 in widelands: Plateau scenario needs a string fix https://bugs.launchpad.net/widelands/+bug/1290070 For more details

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

2014-04-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1298309 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1298309 in widelands: Message We lost a %s to the ocean! cannot easily be translated https://bugs.launchpad.net/widelands

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

2014-04-14 Thread GunChleoc
Done :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1298309/+merge/215707 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1298309 into lp:widelands. ___ Mailing list:

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

2014-04-18 Thread GunChleoc
+1 -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/216424 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands. ___ Mailing list:

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

2014-05-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1322473 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1322473 in widelands: Add Win conditions as an Objective https://bugs.launchpad.net/widelands/+bug/1322473 For more details

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

2014-05-29 Thread GunChleoc
BTW merging this should also make Trunk compile again, because of this line: === modified file 'src/logic/cmd_queue.h' --- src/logic/cmd_queue.h 2014-05-11 12:29:55 + +++ src/logic/cmd_queue.h 2014-05-28 13:43:10 + @@ -22,6 +22,7 @@ #include memory #include queue +#include

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

2014-05-29 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1293158 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1293158 in widelands: Odd line in information tool in editor https://bugs.launchpad.net/widelands/+bug/1293158 For more

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

2014-06-05 Thread GunChleoc
Somments to the suggestions Diff comments: === modified file 'doc/sphinx/source/tutorial.rst' --- doc/sphinx/source/tutorial.rst2013-04-03 09:06:34 + +++ doc/sphinx/source/tutorial.rst2014-05-29 10:48:20 + @@ -269,4 +269,62 @@ coroutines share the same environment and can

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

2014-06-05 Thread GunChleoc
I think in the code is better, because we would end up with a very big screen full of stuff. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1074353/+merge/221095 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1074353 into

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

2014-06-05 Thread GunChleoc
Fixed everything except for some open questions. Diff comments: === modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua' --- maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua 2014-03-25 06:18:48 + +++ maps/MP Scenarios/Island

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

2014-06-05 Thread GunChleoc
Added some fixes + more comments. Diff comments: === modified file 'src/editor/tools/editor_info_tool.cc' --- src/editor/tools/editor_info_tool.cc 2014-03-09 10:28:39 + +++ src/editor/tools/editor_info_tool.cc 2014-05-29 17:16:25 + @@ -49,16 +49,11 @@

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

2014-06-10 Thread GunChleoc
For the translations, the best thing to keep as much as we can is to use the msgmerge utility - I guess you are already using this when integrating updates from Launchpad? We could do something like the following: 1. reconfigure our script for xgettext to collect all world-related strings into

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

2014-06-10 Thread GunChleoc
Review: Needs Fixing merging world catalogues Commented here: https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708/comments/533683 Set to Needs fixing, because we still need to work this out and test ;) --

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

2014-06-11 Thread GunChleoc
Yes, merge them one after the other. I noticed that the merged translation has a good number of fuzzy strings in it. Launchpad will kill these - maybe we should upload a translation archive to the homepage to give translators access. Alternatively, they could download the old world files first

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

2014-06-11 Thread GunChleoc
Review: Approve merging world catalogues -- https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/one_world. ___ Mailing list:

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

2014-06-12 Thread GunChleoc
We could give translators a heads-up in the forum thread, and I can grab an archive in case they need help. It's not that much as you say, so this should suffice - no need for a big announcement on the homepage. How close are we to the merge, do you want me to go ahead and post something? --

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

2014-06-17 Thread GunChleoc
I have made an announcement on the forum and am grabbing a translation archive today. Sorry I'm a bit slow reacting to stuff, I'm travelling at the moment ;) -- https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708 Your team Widelands Developers is subscribed to branch

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

2014-07-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/world-stringfix into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/world-stringfix/+merge/226426 Removed a blank space from tree name

[Widelands-dev] [Merge] lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands

2014-07-11 Thread GunChleoc
The proposal to merge lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347 --

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

2014-07-11 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/world-stringfix into lp:widelands has been updated. Description changed to: Removed a blank space from tree name + added some translator comments ETA: Already fixed by other merge request, but please merge anyway for the added comments.

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

2014-07-11 Thread GunChleoc
Still shows a box character under Map:-Players: Tested with Crossing the horizon I know, but I haven't the foggiest why. Somebody else will have to fix this. If nobody wants to take on this branch, can we merge and open a new bug? --

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

2014-07-11 Thread GunChleoc
I have started on the NOCOMs.I have added the 3 persist/unpersist objects to the test suite (lua_persistence.wmf), but when I run it, it complains about a missing init.lua: bratzbert@museum:~/sources/widelands/bug-1074353$ ./widelands --scenario=test/maps/lua_persistence.wmf Set home

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

2014-07-12 Thread GunChleoc
The last 2 commits are NOCOM(#sirver) comments that need attention. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1074353/+merge/221095 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1074353. ___

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

2014-07-12 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1074353 into lp:widelands has been updated. Description changed to: This is in a mergeable state now, although more work needs to be done, as commented in the source code (comments are in lua_map.cc and format_help.lua). The remaining

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

2014-07-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/rename_goldweaver into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/rename_goldweaver/+merge/226580 Renamed a building to make more

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

2014-07-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1341112 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341112 in widelands: Editor line abruption in Noise height tool https://bugs.launchpad.net/widelands/+bug/1341112 For more

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

2014-07-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_world_names into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592 Some of the skeletons are actually

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

2014-07-14 Thread GunChleoc
OK, will do :) -- https://code.launchpad.net/~widelands-dev/widelands/editor_tweaks/+merge/226606 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_tweaks. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2014-07-14 Thread GunChleoc
If it's creating a problem, leave it - it is not that important. I will add translator comments instead, so translators will know that it's a seashell if they're paying attention. -- https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592 Your team Widelands Developers

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

2014-07-14 Thread GunChleoc
src/wui/unique_window_handler.h creates a linking problem. so I reverted it. All the rest are done. Please double-check the codecheck rule. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 Your team Widelands Developers is subscribed to branch

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

2014-07-14 Thread GunChleoc
I merged it into another branch and it worked :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1332627. ___ Mailing list:

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

2014-07-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/mapobject_cleanup_worker into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341082 in widelands: Building help: clean up name, descname https://bugs.launchpad.net/widelands/+bug/1341082

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

2014-07-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/mapobject_cleanup_building into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341082 in widelands: Building help: clean up name, descname https://bugs.launchpad.net/widelands/+bug/1341082

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

2014-07-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/mapobject_cleanup_soldier into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341082 in widelands: Building help: clean up name, descname https://bugs.launchpad.net/widelands/+bug/1341082

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

2014-07-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/mapobject_cleanup_misc into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341082 in widelands: Building help: clean up name, descname https://bugs.launchpad.net/widelands/+bug/1341082

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

2014-07-14 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fix_world_names into lp:widelands has been updated. Status: Needs review = Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592 --

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

2014-07-15 Thread GunChleoc
GunChleoc has proposed merging lp:~gunchleoc/widelands/mapobject_cleanup into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341082 in widelands: Building help: clean up name, descname https://bugs.launchpad.net/widelands/+bug/1341082 For more

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

2014-07-16 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1342563 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1342563 in widelands: When choosing random tribe and castle village, the tribe can be guessed https://bugs.launchpad.net

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

2014-07-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1342801 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1342801 in widelands: Building help is broken (get_worker_description string expected got table) https://bugs.launchpad.net

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

2014-07-17 Thread GunChleoc
The proposal to merge lp:~hjd/widelands/calculation into lp:widelands has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~hjd/widelands/calculation/+merge/227161 -- https://code.launchpad.net/~hjd/widelands/calculation/+merge/227161 Your

Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-18 Thread GunChleoc
I see no reason why the wildboar should not be in map_generation.lua. I did not know of this file and now I know it, I do not understand it. That' because it was defined in the tribe rather than the world file I guess -- https://code.launchpad.net/~wl-zocker/widelands/bug-1341662/+merge/227395

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

2014-07-19 Thread GunChleoc
Well, it's completely configurable and I'm open to suggestions. We could also make the frequency of messages configurable, so lumberjacks and hunters will only pop up once in a while. Since I don't play often, I'm happy to hear from code illiterates as to what would be appropriate :) --

Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-20 Thread GunChleoc
I added the wildboar to map_generation.lua. It seems to work, so I probably did the right thing :) Looks good to me I noticed that some animals appear twice in the list. Is this to increase the probability of their appearance or simply some leavings from the one_world merge (that can be

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

2014-07-20 Thread GunChleoc
Thanks! Now that I have QT Creator, the code is so much easier to navigate. I fixed the commented stuff, now I still need to implement the delays for the messages. So, please wait with merging until I give you a shout. --

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

2014-07-21 Thread GunChleoc
Also, your editor formats source code quite differently to the codebase, so there are a lot of style checker warnings. Don't you get style warnings during compile? It's a matter of setting up the editor to confirm with our code formatting standards - which I can't find a reference for. I

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

2014-07-21 Thread GunChleoc
OK, all done and ready for merging :) The delay parameters might need some more tweaking, we'll just have to see how it behaves in a real game. Buildings with message delay are hunters, lumberjacks and wells. -- https://code.launchpad.net/~widelands-dev/widelands/bug-999262_part2/+merge/227348

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

2014-07-21 Thread GunChleoc
Thanks for the info. I am looking forward to Ninja :D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341081. ___ Mailing list:

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

2014-07-21 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string_fix_headquarters into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543 Small string fix

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

2014-07-21 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1322741 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1322741 in widelands: text issue: fps statistics overlaps with xz coordinates https://bugs.launchpad.net/widelands/+bug

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

2014-07-22 Thread GunChleoc
Unless someone can come up with a smart shell script that puts bzr blame and codecheck together, a lot of work. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341674/+merge/227693 Your team Widelands Developers is requested to review the proposed merge of

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

2014-07-22 Thread GunChleoc
I have completely shifted the definition of the notification from worker to productionsite. -- https://code.launchpad.net/~widelands-dev/widelands/bug-999262_part2/+merge/227348 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-999262_part2.

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

2014-07-22 Thread GunChleoc
Review: Resubmit This is ready for review again. 2 things I'd like to point out: 1. I had to change the visibility of a class member for the code to compile - check the NOCOM here: http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1341081/revision/7113#src/logic/carrier.h Since it'S

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

2014-07-23 Thread GunChleoc
Review: Resubmit Fixed up the Doxygen comments, so this is good to go. I'll have a separate beanch for the code check rule. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341674/+merge/227693 Your team Widelands Developers is subscribed to branch

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

2014-07-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1341674_codecheck into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341674 in widelands: Consolidate TODO FIXME BUG to one style. https://bugs.launchpad.net/widelands/+bug/1341674

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

2014-07-23 Thread GunChleoc
OK, next try, but I need somebody to help me hunt down a segfault. I have described the problem in my commit message http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1341081/revision/7121 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team

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

2014-07-23 Thread GunChleoc
Done except for removing the name/descname wrappers in L_Map_Object. I opened a new bug for that one, because it's a bigger change. Regarding the spritesheet thing, maybe we can sole this with a new richtext tag that can take a general Image and then use filename + coordinates to get the image

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

2014-07-23 Thread GunChleoc
To unify the, we could all call them Charcoal Burner's House. I did some digging online and there doesn't seem to be an easy English term for the German Köhlerei at all. You can have a pit or a stack, but what you see in-game is a house: What about kiln?

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

2014-07-24 Thread GunChleoc
Barbarians do not build houses. I understand that there is movement to unify names, but please also keep the in mind that the three tribes should be different and should have their own individuality. We should have a Charcoal Burner's Hut then for consistency. --

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

2014-07-24 Thread GunChleoc
Review: Resubmit I fixed the line and cleaned out the build directory and the segfault is gone. Thanks! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341081.

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

2014-07-24 Thread GunChleoc
Shall we go with Charcoal Kiln for all 3 buildings then? @ _aD: Is there a special name for the worker as well? At the moment, we're simply using Burner. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the

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

2014-07-24 Thread GunChleoc
Thanks! I think it might be beneficial to rename the worker from Burner to Charcoal Burner, if it doesn't confuse old players. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the proposed merge of

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

2014-07-24 Thread GunChleoc
You are welcome to take over this branch, since I'm done with the easy part of it :) Maybe you can bzr merge your branch into this -- https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 Your team Widelands Developers is requested to review the proposed merge of

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

2014-07-25 Thread GunChleoc
I think this is done now - except for 1 empty TODO comment that I left around. Maybe someone else will know why there's a TODO there: src/io/filesystem/zip_filesystem.cc:563: Use TODO(username): msg. Do not add empty TODO comments. I have also made the feedback individual to each case, so the

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

2014-07-25 Thread GunChleoc
Thanks for your help! With a look at your code, I should be able to fix them all except for lua_map.cc The problem in building.cc was the constness of the string. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 Your team Widelands Developers is requested to

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

2014-07-25 Thread GunChleoc
Review: Resubmit I have moved the codecheck rule into a new branch, so we can get this code in faster. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1343302/+merge/227432 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1343302.

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

2014-07-25 Thread GunChleoc
The problem in building.cc was the constness of the string. Actually, it wasn't but I solved it anyway :) We have a problem with a crash in pathfield-cc, so I reverted the new code. I had a go at it, but can't get it to work. Here's one of my attempts: for (boost::shared_ptrPathfields

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

2014-07-25 Thread GunChleoc
Almost done - we need somebody to figure out the problem in logic/pathfield.cc, and when that one's gone we can delete container_iterate_const and wl_const_range from deprecated.h. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 Your team Widelands Developers is

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

2014-07-25 Thread GunChleoc
Let's use Charcoal Burner for the worker and Charcoal Kiln for the building then - with the capital letters like that. English Speakers Like Their Title Case :P -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the

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

2014-07-25 Thread GunChleoc
I merged trunk in the other branch, so if you could merge that first, I can then take care of any remaining conflicts. I made the mistake of first splitting off this branch and then merging trunk into the other --

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

2014-07-25 Thread GunChleoc
Review: Resubmit Trunk is merged :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341674_codecheck/+merge/227936 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341674_codecheck. ___ Mailing list:

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

2014-07-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1344350 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1344350 in widelands: Constructionsites/dismantlesites only show a dot instead of building image https://bugs.launchpad.net

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

2014-07-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/help_stringfixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/help_stringfixes/+merge/228456 Some small string fixes -- https

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

2014-07-28 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1347648 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1347648 in widelands: Add Map_Object:descr to Lua interface https://bugs.launchpad.net/widelands/+bug/1347648 For more

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

2014-07-28 Thread GunChleoc
We are planning to turn the conf files into Lua files anyway (just like with one_world), so I don't think bothering with a code check rule right now makes sense. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1344179/+merge/228498 Your team Widelands Developers is requested to

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

2014-07-29 Thread GunChleoc
This is the first time anybody has mentioned that particular Python script to me. Is this documented somewhere in the Wiki? We sould have a complete dosumentation on regression tests there, at least a list of scripts that can be run. --

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

2014-07-29 Thread GunChleoc
Review: Resubmit Yes it is, I have been wanting this from the beginning and now I finally have the C++ skills (and IDE :P) to pull this off. Depending on what our translators say, we might still need to do further tweaks in the future (e.g. on the summing for is/are - languages might handle

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

2014-07-29 Thread GunChleoc
OK. this should be mergeable now. There is one thing I was wondering though: why is m_result_buffer in productionsite.cc of type char[213] rather than std::string? I don't understand the relevance of the type for the map_io object, which has a buffer length check in it. I'd prefer a dynamic

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

2014-07-29 Thread GunChleoc
I can just bzr revert if it blows up :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1348795/+merge/228430 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1348795. ___ Mailing list:

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

2014-07-30 Thread GunChleoc
Review: Resubmit This is ready for review again. - Changed 2 protected char* buffers to private strings. - Added Out Of Fields etc. tooltip - Refactored ProductionProgram::ActMine::notify_player and ProductionSite::worker_failed_to_find_resource - Fixed codecheck warnings NOCOMs --

  1   2   3   4   5   6   7   8   9   10   >