> 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.
--
https://code.launchpad.net/~widelands-dev/widelands/gci18nf
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
lp:~widelands-dev/widelands/gci1
https://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.launchpa
I need help with testing first though, which is why I created a separate branch
in the first place. Once we have this tested and running, I can just copy the
scenario files to the other branch and scrap this branch.
--
https://code.launchpad.net/~gunchleoc/widelands/smugglers-i18n/+merge/205496
ave 3
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/widela
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/gci18n
I did a merge on my local hard drive trunk -> gci18nfixes, and now I get a
whole bunch of errors of the type
/src/logic/productionsite.h:156:33: error: ‘override’ does not name a type
/src/logic/productionsite.h:157:38: error: expected ‘;’ at end of member
declaration
I get them in logic and ec
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, w
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 :)
--
https://code.launchpad.net/~widelands-dev/
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
lp:~widelands-dev/widelan
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 di
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")
==
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/209770
Some small string bugfixes for i18n.
Catalogs
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
GunChleoc has proposed merging lp:~gunchleoc/widelands/i18n-20140307 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/i18n-20140307/+merge/210046
Some more i18n fixes.
Catalogs and translations
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/wide
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
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.
_
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 in
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
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,
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1290123 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1290123 in widelands: "Delete barbarian stronghold"
https://bugs.launchpad.net/widelands/+bug/1290123
For more de
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"
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
The proposal to merge lp:~widelands-dev/widelands/fix-strings into lp:widelands
has been updated.
Status: Needs review => Approved
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix-strings/+merge/210465
--
https://code.launchpad.net/~widelands-dev/widelands/fix-
Yes, I think this looks fine. It would be great to have the kayboad shortcuts
as a table, but that would take some programming. Let's merge it like it is for
now.
--
https://code.launchpad.net/~widelands-dev/widelands/fix-strings/+merge/210465
Your team Widelands Developers is subscribed to bran
GunChleoc has proposed merging lp:~widelands-dev/widelands/i18n-20140310 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/i18n-20140310/+merge/210561
Some more string fixes. Resized
GunChleoc has proposed merging lp:~widelands-dev/widelands/i18n-20140314 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/i18n-20140314/+merge/211191
Some more small string fixes.
--
https
Review: Approve
Thanks for taking care of this bug :)
--
https://code.launchpad.net/~widelands-dev/widelands/mine-symbol/+merge/211195
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/mine-symbol into lp:widelands.
_
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 de
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,
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
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:
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: https://la
+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: https://launc
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
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1324137 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1324137 in widelands: "Update Lua primer"
https://bugs.launchpad.net/widelands/+bug/1324137
For more details,
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
#include
+#include
--
https:
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
Some comments to the comments - I didn't notive this until now :(
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
Some comments to the nits.
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 @@
> Widelands::Field &
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 c
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 l
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
Added some fixes. Some issues are still open.
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
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 @@
> Widelands::
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
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 ;)
--
https://code.launchpad.net/~widelands-dev/widelands/one_world/+m
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
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: https://launchpad.
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?
--
h
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
lp:
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
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
--
https://code.launchpad.net/~hjd/widelands/space-and-tiny-f
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.
https:
> 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?
--
https://code.launchpad.net/~widelands-dev/widelands/bug
I have found a better example for the plural forms (en "cat" = gd "cat"). I
think this is ready for merging now.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1324137/+merge/221353
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1324137.
_
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 directory:
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.
___
Mai
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 issue
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1339861 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1339861 in widelands: "Remove the "Military settings" option"
https://bugs.launchpad.net/widelands/+b
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
Thanks :)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1293158/+merge/221434
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1293158.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to
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/13
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
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1330599 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1330599 in widelands: "Forbid SDL integer types in codecheck and remove
its use"
https://bugs.launchpad.net/wide
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
P
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
I had another idea: what will heppen if I change just the localization string,
e.g.
name = "skeleton4",
descname = _ "Seashell",
Will that cause problems?
--
https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592
Your team Widelands Developers is subscribed to branch
Yes, I have grepped for "weaver", and also tested the Atlantean campaign.
We have broken the savegames recently with a whole bunch of these, so I think
one more can't hurt, as long as we do it before Build 19.
I have merged trunk, so the text conflict should be gone now.
--
https://code.launchp
I did the change to the macro.
struct ITransportCostCalculator {
virtual ~ITransportCostCalculator() {}
virtual int32_t calc_cost_estimate(Coords, Coords) const = 0;
DISALLOW_COPY_AND_ASSIGN(ITransportCostCalculator);
TypeName() = default;
};
results in:
[ 5%]
OK, new branch:
https://code.launchpad.net/~widelands-dev/widelands/skeletons2seashells
Let's scrap this one.
--
https://code.launchpad.net/~widelands-dev/widelands/fix_world_names/+merge/226592
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fix_world_names.
GunChleoc has proposed merging lp:~widelands-dev/widelands/skeletons2seashells
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/skeletons2seashells/+merge/226725
Some small i18n stuff
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
lp:~widelands-dev/wi
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: https://
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/+b
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/wide
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/wide
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/+b
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
--
https://code.launchpad.net/~widelands-dev/widela
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
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.lau
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1341081 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1341081 in widelands: "Building help: clean up type() and
MapObject::type_name() "
https://bugs.launchpad.net/wide
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)&quo
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 tea
Done :)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1342563/+merge/226981
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1342563.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to
return CAST_TO_LUA(ProductionSite_Descr,
> L_ProductionSiteDescription);
> }
> + else if (is_a(ConstructionSite_Descr, desc)) {
> + return CAST_TO_LUA(ConstructionSite_Descr,
> L_ConstructionSiteDescription);
> + }
> else if (is_a(Warehouse_Descr,
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-999262_part2
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #999262 in widelands: "Immovable attribs (e.g. stone) are not
translatable"
https://bugs.launchpad.net/wide
I did a bit of grepping...
Do we want to add the wildboar to one of the critter lists in
world/map_generation.lua?
Do we still need to parse critters into the tribe? I found this line:
src/logic/tribe.cc: PARSE_MAP_OBJECT_TYPES_BEGIN("critter
bob")
--
https://code.launchpa
> 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/22739
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 :)
--
https:
> 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 b
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.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-999262_part2/+merg
roductionSiteDescription);
> }
> + else if (is_a(ConstructionSite_Descr, desc)) {
> + return CAST_TO_LUA(ConstructionSite_Descr,
> L_ConstructionSiteDescription);
> + }
> else if (is_a(Warehouse_Descr, desc)) {
> return CAST_TO_
> 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 do
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
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: ht
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
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/wide
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
lp:~widelands-dev/widelands
1 - 100 of 4401 matches
Mail list logo
