233 Commits

Author SHA1 Message Date
Ali El Gariani
c88e37bcfa Add {MAGENTA_IS_THE_TEAM_COLOR} in mainline [faction]
not needed but standardize how we team-color unit images
2008-07-11 23:37:29 +00:00
Ali El Gariani
911a00f315 In factions cfg, clean the "name" key and use the new "image" key.
This activate the new team-coloring of factions in MP lobby (see 2008-07-10T00:21:31Z!alinkmaze@gmail.com)
2008-07-10 00:29:33 +00:00
Gunter Labes
c0f190aa8e typo and indentation fixes 2008-07-06 17:45:42 +00:00
Lari Nieminen
89dbf2d5a3 Added units/ for the random faction icon too. 2008-06-28 13:01:21 +00:00
Lari Nieminen
8b02bad4b7 Added units/ to unit image paths. 2008-06-28 13:00:16 +00:00
Gunter Labes
15b0e6dc20 revised maps: Sablestone Delta, The Freelands 2008-06-11 14:32:15 +00:00
Eric S. Raymond
1f1fc2164f Re-enable macro argument type checking, and fix some glitches it turns up.
Most changes in this diff just rename macro formal args so they match
what the type checker expects.
2008-06-09 16:25:13 +00:00
Benoît Timbert
554f01f3ee Rename as "hidden" the "hides" status
drop the backward compatibility with the old "stone" status (which
comes from before 1.4.x)
2008-05-23 22:26:55 +00:00
Benoît Timbert
71fdce2ae2 [[faction_from_recruit]]
- don't lock the faction if recruit= is set, except if
  faction_from_recruit=yes (it used to lock the faction in all cases).

- get the first best matching faction when choosing a faction from a criteria

PS: It's time to sleep, i'll document this and the existing
undocumented faction= feature tomorrow.

This gives some time to get a better name for this new
"faction_from_recruit" key - feel free to "fix" it in the meantime.
2008-05-18 00:40:26 +00:00
Nils Kneuper
d1897fba77 some stuff by wmllint...
...(correcting one mistake, removng an empty line at the end of a
file, adding a newline at the end of file)
2008-05-17 12:26:43 +00:00
Lari Nieminen
836ad7d695 Cleaned up a few macro references. 2008-05-17 10:32:23 +00:00
Nils Kneuper
bdd9f898e7 remove lines with huge amounts of (unneeded?) whitespace,
...those are a real problem to see in translation files

if they are needed, please readd them and concatenate as
untranslateable strings (that is: message= _"my message" + "


 ")
2008-05-11 14:10:43 +00:00
Pauli Nieminen
becda0f479 revert non-intented changes 2008-05-09 13:55:12 +00:00
Pauli Nieminen
c5fc49d650 Fixed a bug that caused game configs to reload evne if not needed 2008-05-09 12:31:23 +00:00
Gunter Labes
aac1298985 revised map: Den of Onis 2008-05-03 01:09:59 +00:00
Lari Nieminen
25e528fb35 Prevent the help menu from invalidating undo. 2008-04-26 13:32:44 +00:00
Lari Nieminen
3a835c614f Use PLACE_IMAGE instead of the deprecated SET_IMAGE. 2008-04-26 13:26:59 +00:00
Lari Nieminen
aeffaa05de Remove the limitation of needing at least 1 MP to perform any action.
Test please.
2008-04-26 13:02:52 +00:00
Gunter Labes
9b274eac4e line ending and svn property tweaks 2008-04-24 01:50:22 +00:00
Gunter Labes
1b8d44e84d revert 2008-04-23T19:07:49Z!esr@thyrsus.com 2008-04-23 20:34:59 +00:00
Gunter Labes
8c61572b07 revert 2008-04-23T19:31:40Z!esr@thyrsus.com, something went wrong there... 2008-04-23 20:27:27 +00:00
Benoît Timbert
0e72c8312e Fix a few SVN properties 2008-04-23 19:59:16 +00:00
Eric S. Raymond
9db68b9b88 Back out my previous commit; I misunderstood the spec for the name change. 2008-04-23 19:31:40 +00:00
Eric S. Raymond
6921485048 campaigns -> add-ons.
This has been tested with the game, but the campaign-server client may 
need work.
2008-04-23 19:07:49 +00:00
Gunter Labes
62ffc00ef5 add the standard multiplayer_ prefix to the id 2008-04-23 13:58:21 +00:00
Eric S. Raymond
4bd5572544 Fix a couple of glitches revealed by wmllint. 2008-04-23 09:24:17 +00:00
Gunter Labes
4b75873c1e removed map: Amohsad Caldera 2008-04-21 17:34:06 +00:00
Gunter Labes
7d11cf65de added maps: Howling Ghost Badlands
revised maps: Sablestone Delta, Sullas Ruins, Silverhead Crossing, The
Freelands, The Manzivan Traps
2008-04-21 08:54:56 +00:00
Lari Nieminen
1f9b1219c7 Tabs to 4 spaces for ANL (it was using only tabs for indentation). 2008-04-15 12:26:26 +00:00
Patrick Parker
14247b09cd patch #1037: Filter_x renaming 2008-04-08 07:15:25 +00:00
Lari Nieminen
436d4eceb5 Made the "get to work" and "oversee research" menus not invalidate undo...
...if you cancel them and renamed the CAPTURE_VILLAGE macro to
ANL_CAPTURE_VILLAGE to prevent conflicts.
2008-04-04 09:54:16 +00:00
Benoît Timbert
36e0ee2823 Fix a few SVN properties 2008-04-03 22:43:34 +00:00
Eric S. Raymond
659f5d1894 More suppression of spurious wmllint warnings. 2008-04-03 19:13:14 +00:00
Eric S. Raymond
6d98b75bdb Fix various broken things in ANL picked up by wmllint and wmlscope. 2008-04-03 13:23:25 +00:00
Lari Nieminen
219ab02d6a Optimized the way the movement restrictions on guardians and enemy leaders...
...are set.
2008-04-03 11:03:38 +00:00
Lari Nieminen
7aa9360b0b Changed the player[<side>] array to individual player_<side> blocks...
...and cleaned up their initialization to use [set_variables].
2008-04-03 10:24:52 +00:00
Eric S. Raymond
8eb591aade Fix an inadvertent commit. 2008-04-01 13:21:09 +00:00
Piotr Cychowski
68a6322525 Add ANL textdomain 2008-03-31 19:08:00 +00:00
Piotr Cychowski
50d48d6747 Merge ANL as per patch #936 + Some auto fixes by wmllint 2008-03-31 19:04:13 +00:00
Lari Nieminen
b5cea4b58a Made the MP random map generator be included explicitly for the editor...
...so that the editor doesn't need to set the MULTIPLAYER symbol. Also
made the editor include the UMC campaigns dir, so that UMC can make
their custom terrains available to the editor.
2008-03-29 13:15:26 +00:00
Eric S. Raymond
83ae0b3bc8 Apply wmlindent. 2008-03-26 14:04:37 +00:00
Eric S. Raymond
e5e500ca60 [unit_type] unit_description -> description 2008-03-21 03:26:09 +00:00
Eric S. Raymond
39733d0ed1 wmllint had a bug. Fix it, and commit the resulting lifts. 2008-03-17 12:12:18 +00:00
Eric S. Raymond
4ec05d32b7 Fix up WML variable references...
...to track the SingleUnitWML attribute name changes.  These cannot be
lifted mechanically, but wmllint warns about possible problems.
2008-03-15 21:55:05 +00:00
Eric S. Raymond
b2b55e5996 description= -> name in [unit]
This will cause unit names to be displayed incorrectly from savefiles made 
since 2008-03-14T01:38:17Z!esr@thyrsus.com.  It was either that or break compatibility with 1.3/1.4 
savefiles.
2008-03-15 20:30:45 +00:00
Eric S. Raymond
17c9e1e0ad user_description= -> description=
Code for SUF and reading unit configs has been modified
so things should work backward-compatibly.
2008-03-14 01:38:17 +00:00
Eric S. Raymond
9d430b0ed9 Enable wmllint to detect places where interpreting description= as...
...user_description= is interpreted now would cause SUFs to break.  

Fix two wacky macros that caused false positives on this test
in mainline.
2008-03-13 21:30:54 +00:00
Eric S. Raymond
c66aa1eb74 Various cleanups related to description= -> id=, mostly comment fixes. 2008-03-13 09:14:15 +00:00
Eric S. Raymond
5b8286d4d9 description= was being used incorrectly, and isn't needed. 2008-03-13 08:33:24 +00:00
Eric S. Raymond
36e4066648 Fix some slightly munged maps. I think this indicates a wmllint bug. 2008-03-13 08:21:22 +00:00