1
0
forked from 0ad/0ad
Commit Graph

6107 Commits

Author SHA1 Message Date
40c1f32eef Carth war ele uses Zaggy's new elephant.
This was SVN commit r12199.
2012-07-26 17:28:54 +00:00
gregory
3050cdc8c6 This was SVN commit r12197. 2012-07-26 09:25:31 +00:00
gregory
37b8bef3a8 Added prop points to the elephant.
This was SVN commit r12196.
2012-07-26 09:02:29 +00:00
gregory
9564de4f17 Added elephant death animation.
This was SVN commit r12195.
2012-07-26 02:17:44 +00:00
gregory
189eaefe7d This was SVN commit r12194. 2012-07-25 23:55:33 +00:00
gregory
a3cb804ccb This was SVN commit r12193. 2012-07-25 23:38:01 +00:00
bfcbcc7ba8 Preserve selection order when entities are 'renamed'. Patch by Deiz/F00. Fixes #1544.
e.g. If you have a long wall as primary selection and CC as secondary,
after the gate upgrade the wall (now gate) remains the primary
selection.

This was SVN commit r12192.
2012-07-25 22:20:57 +00:00
0dc1d2139e Make rally points work for trade. Patch from Deiz/F00. Fixes #1173.
This was SVN commit r12191.
2012-07-25 21:38:56 +00:00
gregory
006aa8ee21 Added elephant animations except the death animation. Contains no prop points currently.
This was SVN commit r12190.
2012-07-25 05:10:13 +00:00
56b83a3926 Fixed the grapes.
Gave Persian healer a run.

This was SVN commit r12189.
2012-07-24 17:45:30 +00:00
a4cc749eca Committing the left out grapes.
This was SVN commit r12188.
2012-07-24 14:51:24 +00:00
3d973b3554 Adds hotkey (Tab) for showing all player's entities' status bars at once, based on patch by Deiz/F00. Fixes #1187
This was SVN commit r12187.
2012-07-24 04:14:09 +00:00
1f15257987 Update actor editor for data driven textures. From zoot. Refs #1493.
This was SVN commit r12184.
2012-07-23 22:51:20 +00:00
f598101c34 Add support for multiple UVs and data driven texture loading. From myconid's patches. Fixes #1493 and fixes #1497.
This was SVN commit r12183.
2012-07-23 22:49:46 +00:00
068fe0cbbb Added Omnri's new tracks to Macedonian and Athenian civ jsons.
Added "breath" creation sound for female citizen.

This was SVN commit r12182.
2012-07-23 16:38:50 +00:00
13759f3572 Helen of Troy, not Hellen of Troy. ;)
This was SVN commit r12181.
2012-07-23 16:34:34 +00:00
4cbbbe6b04 This was SVN commit r12180. 2012-07-23 16:33:53 +00:00
OmriLahav
8cf822c6c3 This was SVN commit r12177. 2012-07-23 10:44:03 +00:00
OmriLahav
e8fae14a3f This was SVN commit r12176. 2012-07-23 10:36:16 +00:00
OmriLahav
31f4b17d54 This was SVN commit r12174. 2012-07-22 21:44:15 +00:00
6bcb4455ef Animations for Celt stone wall gate
This was SVN commit r12172.
2012-07-21 22:56:56 +00:00
d8b89936b3 New palisade gate animations
This was SVN commit r12171.
2012-07-21 00:58:40 +00:00
666c12a309 Animations for Athenian wall gate
This was SVN commit r12170.
2012-07-20 23:16:03 +00:00
04a7b2becd Hele animated stone wall gates
This was SVN commit r12169.
2012-07-20 22:56:26 +00:00
bccafceb09 Some map updates and map previews.
This was SVN commit r12168.
2012-07-20 18:37:54 +00:00
a5f737b441 Fixed map description.
This was SVN commit r12167.
2012-07-20 05:02:51 +00:00
b8ec515234 Construction cost should be checked after everything else to avoid messy refunds.
This was SVN commit r12166.
2012-07-20 02:50:43 +00:00
a41432f73b Adds support for Cost/Resources and Cost/BuildTime tech modifications.
This was SVN commit r12165.
2012-07-20 01:54:24 +00:00
1bf086fefb Animations for Carthaginian stone gate
This was SVN commit r12164.
2012-07-19 23:45:07 +00:00
574e079d64 Wall and gate selection usability improvements by Deiz/F00. Refs #619.
Fixes bug where selecting multiple wall types could convert to
mismatching gates.

This was SVN commit r12163.
2012-07-19 21:46:35 +00:00
512e3a01b6 Celt gate resized to the size of long wall
This was SVN commit r12162.
2012-07-19 20:47:30 +00:00
c1c0fcc67a This was SVN commit r12161. 2012-07-19 18:28:02 +00:00
4c1ddd33c5 This was SVN commit r12160. 2012-07-19 05:53:36 +00:00
718e1dfad4 Updating fortress random map to use the new autumn textures.
This was SVN commit r12159.
2012-07-19 05:41:08 +00:00
b6faac80ae Templates of the new trees.
This was SVN commit r12158.
2012-07-19 05:36:58 +00:00
bdd04befd2 Actors of the new art assets.
This was SVN commit r12157.
2012-07-19 05:35:56 +00:00
563197a409 Meshes for the new art assets.
This was SVN commit r12156.
2012-07-19 05:31:14 +00:00
c4d248c53c This was SVN commit r12155. 2012-07-19 05:29:58 +00:00
08022d87ca This was SVN commit r12154. 2012-07-19 05:29:19 +00:00
c4a3c9045a This was SVN commit r12153. 2012-07-19 05:28:30 +00:00
47130edc74 This was SVN commit r12152. 2012-07-19 05:25:56 +00:00
940beaebfe Textures for new graphical assets.
This was SVN commit r12151.
2012-07-19 05:23:49 +00:00
575f0371e6 Specific names for elephant stables and worker elephant.
This was SVN commit r12150.
2012-07-19 05:21:28 +00:00
1c4302cf5d Autumn terrain textures
This was SVN commit r12149.
2012-07-19 04:53:34 +00:00
89399e08e6 Implements always visible hero selection rings, based on patch by Deiz/F00. Fixes #1365
This was SVN commit r12148.
2012-07-19 04:45:01 +00:00
380d15d6c0 Resized model of the Carthaginian gate. Same size as long wall.
This was SVN commit r12147.
2012-07-18 23:29:56 +00:00
3a5b2159b7 Fixes broken test
This was SVN commit r12146.
2012-07-18 21:39:45 +00:00
3c8c5757de Adding icons to wooden gates
This was SVN commit r12145.
2012-07-18 21:17:14 +00:00
f0d9b496bf Wooden gate icon for palisades and siege walls
This was SVN commit r12144.
2012-07-18 19:40:14 +00:00
0374570ac6 Fixed error.
This was SVN commit r12143.
2012-07-18 06:01:26 +00:00
5546fb4283 Fix dog errors.
This was SVN commit r12142.
2012-07-18 05:52:31 +00:00
9761ded603 Specific names for the Briton/Gaul gates based on Bruno's research.
This was SVN commit r12141.
2012-07-18 05:08:45 +00:00
181b461e7b This was SVN commit r12140. 2012-07-18 03:57:45 +00:00
9b6839ace4 Adds gate conversion to palisades and siege walls. Fixes bug that all player entities in a selection could be converted to gates. Cleans up templates slightly. Refs #619
This was SVN commit r12139.
2012-07-18 03:56:18 +00:00
95dea8e097 Gate-related template cleanup and tweaking
This was SVN commit r12138.
2012-07-18 01:10:47 +00:00
b186fc4e7e A small tweak.
This was SVN commit r12137.
2012-07-17 03:55:00 +00:00
65ac54c4dd This was SVN commit r12136. 2012-07-17 03:53:52 +00:00
a1cc4e623e New map previews by luziferius.
This was SVN commit r12135.
2012-07-17 03:49:15 +00:00
c495b0bca1 Adds gate cost to tooltip and shows both gate lock actions, based on patch by Deiz/F00. Changes and renames lock icons. Fixes #1539
This was SVN commit r12134.
2012-07-16 23:49:19 +00:00
a26f230867 Roman siege wall gate animations
This was SVN commit r12133.
2012-07-16 21:10:43 +00:00
a700486cd3 Lock icons for gates
This was SVN commit r12132.
2012-07-16 18:04:23 +00:00
1202c2b2a3 Some preview images for these scenarios.
This was SVN commit r12131.
2012-07-16 17:18:16 +00:00
gregory
db2bbc10ca Made model able to be imported into Blender.
This was SVN commit r12130.
2012-07-16 15:32:59 +00:00
b444e3c435 Cleanup...
This was SVN commit r12129.
2012-07-16 05:52:43 +00:00
f3d0aaeeb4 Waypoint and garrison flags for Mauryans.
This was SVN commit r12128.
2012-07-16 05:05:41 +00:00
39e0878b6e This was SVN commit r12126. 2012-07-16 04:43:12 +00:00
6d93492e54 Added Mauryans to Punjab 1.
This was SVN commit r12125.
2012-07-16 04:37:35 +00:00
3153829d45 Made the dust a little more transparent.
This was SVN commit r12124.
2012-07-16 04:28:00 +00:00
9f5c7a5607 Fixes possible conflicts in unit command panel when selecting multiple entities, patch by Deiz/F00. Fixes #1524
This was SVN commit r12123.
2012-07-16 04:12:48 +00:00
3a85fb7c48 Displays save game timestamps in local time rather than UTC, patch by Deiz/F00. Fixes #1530
This was SVN commit r12122.
2012-07-16 03:55:40 +00:00
743f60b920 Handles gate upgrade case left out of previous commit.
This was SVN commit r12121.
2012-07-16 01:52:18 +00:00
b59c2d9e36 Adds lock/unlock gate icons, based on patch by F00.
This was SVN commit r12120.
2012-07-16 01:40:09 +00:00
27a0bd6331 Gate lock and unlock icons
This was SVN commit r12119.
2012-07-15 23:40:49 +00:00
8f0eb7318e Iberian gate animations
This was SVN commit r12118.
2012-07-15 22:34:49 +00:00
8d64c26db9 Decrease trader income to 20% of the previous and increase the cost of traders to 100f 80m.
This was SVN commit r12117.
2012-07-15 18:55:35 +00:00
937670a916 Lots of Mauryan unit stuff.
This was SVN commit r12116.
2012-07-15 07:09:26 +00:00
900affb9bf This was SVN commit r12115. 2012-07-15 06:41:41 +00:00
694619a984 Adds gates to Fortress random map by FeXoR. Fixes #1533
This was SVN commit r12114.
2012-07-15 04:28:57 +00:00
3eafdcf6db Roman gate animations
This was SVN commit r12113.
2012-07-15 00:17:38 +00:00
4ca8e679d6 Persian gate animations again
This was SVN commit r12112.
2012-07-15 00:06:25 +00:00
e0f3add90e Mauryan basic spearman.
This was SVN commit r12111.
2012-07-14 23:13:53 +00:00
1fd00b5e3f Added Lorraine Plain random map.
This was SVN commit r12110.
2012-07-14 17:17:06 +00:00
62f7c6e27a Trying to fix gate animation locking animations
This was SVN commit r12109.
2012-07-14 09:04:20 +00:00
2cdc6c7dbf Persian gate opening and closing animations
This was SVN commit r12108.
2012-07-14 08:04:00 +00:00
5e92aabe72 Increases maximum dropdown list size slightly, allowing up to 10 lines at a time (must be careful that it fits on 1024x768!). Refs #1532
This was SVN commit r12107.
2012-07-14 04:29:16 +00:00
8c9ef1139a This was SVN commit r12106. 2012-07-14 04:15:20 +00:00
1b7519be91 Fixing the random player selection
This was SVN commit r12104.
2012-07-14 03:10:35 +00:00
1d677156fd Adds animation and sound support to wall gates. Uses temporary sounds for now. Adds new animation choices to actor viewer/editor. Refs #619
This was SVN commit r12103.
2012-07-14 03:08:21 +00:00
fd22b91138 Do not close a gate if some units are in the passRange.
This was SVN commit r12102.
2012-07-13 22:34:49 +00:00
c908970c02 This was SVN commit r12101. 2012-07-13 04:37:04 +00:00
8cd2751131 This was SVN commit r12100. 2012-07-13 04:15:23 +00:00
1233323e79 A minor change.
This was SVN commit r12099.
2012-07-13 04:05:13 +00:00
d0a1a3bd50 Fixed a bug.
This was SVN commit r12098.
2012-07-13 03:41:07 +00:00
2717e6d34f Adding previews for some random maps.
This was SVN commit r12097.
2012-07-13 03:10:15 +00:00
c63074cabb New GUI changes.
This was SVN commit r12096.
2012-07-13 03:00:18 +00:00
6eb71380aa Get the gate template name from the wall name and fixes two templates which caused errors.
This was SVN commit r12095.
2012-07-12 22:49:40 +00:00
953606cfcf Roman wall gate animations
This was SVN commit r12094.
2012-07-12 22:27:59 +00:00
51b9fa6186 Uses xml attributes instead of elements for obstructions shapes.
This was SVN commit r12093.
2012-07-12 20:00:38 +00:00
8f2ed2586f Fixed "specific name" for palisades, since they were taking "stone wall" from the defense_wall template.
This was SVN commit r12091.
2012-07-11 16:44:03 +00:00
3edbe6490e Palisade gate opening and closing animations
This was SVN commit r12090.
2012-07-11 16:40:56 +00:00
f340c8be63 Skeletal setup for animated opening and closing gates
This was SVN commit r12089.
2012-07-11 15:36:00 +00:00
c8b024ec5f Updates to a few sounds
This was SVN commit r12087.
2012-07-10 20:16:29 +00:00
0ef77d550c Britons get the Kennl.
Gauls get the Rotary Mill.

This was SVN commit r12086.
2012-07-09 03:24:50 +00:00
1926a18354 Britons emblem.
This was SVN commit r12085.
2012-07-08 21:22:27 +00:00
b7e6bbdf3f Fixes waypoint flags for Britons and Gauls.
This was SVN commit r12084.
2012-07-08 20:15:16 +00:00
e416b38811 Fix phases.
This was SVN commit r12083.
2012-07-08 20:12:36 +00:00
2c5933912c Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385, refs #619.
This was SVN commit r12081.
2012-07-08 16:25:33 +00:00
9a3a6b9c2f Tweaked Mauryan sandbox.
This was SVN commit r12080.
2012-07-07 21:54:43 +00:00
68f44a74bd - Fig Tree: Gave it the "berry bush" selection sound to help drive home that it is a fruit-bearing tree.
- All Mauryan buildings: Removed the Persian structural health bonus, a
legacy from copying over from Persian templates.
- Mauryan Barracks: Added the Indian Light Cavalry to the training
roster. Removed the Persian Barracks portrait icon.

This was SVN commit r12079.
2012-07-07 21:38:48 +00:00
4cd3a93ca4 Fixes inconsistent bow props on some Persian units, based on patch by dvangennip. Fixes #1523
This was SVN commit r12078.
2012-07-06 23:52:17 +00:00
54e24d9a43 Fixed costs for Carthaginian embassies.
This was SVN commit r12076.
2012-07-06 00:57:59 +00:00
80d6d8930e Alters tooltips for Town and City Phase upgrades for clarity. Closes #1447
This was SVN commit r12075.
2012-07-06 00:23:31 +00:00
463e62a514 Added checks to see if a resource is in another players territory and to mark a resource as inaccessible if a unit has spent too long trying to reach it.
This was SVN commit r12074.
2012-07-05 21:14:48 +00:00
fba0730db9 Add a comment about maxDensity based on FeXoR's description. Refs #1522.
This was SVN commit r12071.
2012-07-04 18:59:11 +00:00
585a30e1f3 Added FeXoR's changes for deep forest. Fixes #1522 .
This was SVN commit r12070.
2012-07-04 17:25:18 +00:00
f845878039 Renamed.
This was SVN commit r12067.
2012-07-04 01:48:57 +00:00
2bf4cde60a This was SVN commit r12066. 2012-07-04 01:46:44 +00:00
b26e6a442a - Updated Persian Stable and Barracks portraits.
- Updated Carth and Pers civ files.
- Updated some Carth structure templates.

This was SVN commit r12065.
2012-07-04 01:08:51 +00:00
56571f4934 Theban stuff.
This was SVN commit r12063.
2012-07-04 00:05:43 +00:00
835af18630 Civ jsons.
This was SVN commit r12062.
2012-07-03 23:04:58 +00:00
7cfbf43f5e This was SVN commit r12061. 2012-07-03 07:07:50 +00:00
31a58e07c1 Fixes Builder component to allow repairers who can't place new foundations.
This was SVN commit r12060.
2012-07-03 03:15:39 +00:00
e8f5f74f71 Trying to make Worker Elephant construct buildings, without listing a list of buildings in its UI.
This was SVN commit r12058.
2012-07-03 02:52:11 +00:00
292cb1d26a Adjusted splash damage for onagers. Adjusted stats for Mauryan houses. Added builder support for Mauryan Worker Elephant.
This was SVN commit r12057.
2012-07-03 02:38:24 +00:00
99d04e93bb Implements global tech modification function. Fixes #1358, refs #1520.
Applies tech modifications to template data returned by GuiInterface.
Extends engine to load arbitrary global scripts, separates this from RNG
replacement. Refs #1193.
Loads global scripts for most script contexts for consistency.
Adds simulation tests for global scripts.

This was SVN commit r12056.
2012-07-03 02:16:45 +00:00
db943341a8 Secretly adding Gear random map.
This was SVN commit r12055.
2012-07-02 13:11:02 +00:00
11ec25726a Bug fixes. Some suggested by wraitii.
This was SVN commit r12054.
2012-07-02 08:07:59 +00:00
e4f9816166 This was SVN commit r12053. 2012-07-02 07:43:44 +00:00
45c5e991d7 Fixing the bug on Deep Forest random map by FeXoR. Fixes #1513.
This was SVN commit r12052.
2012-07-02 03:28:27 +00:00
130caac4f5 Smoke, less thick.
This was SVN commit r12051.
2012-07-01 19:19:31 +00:00
f38ba1d91b Updated the Sahel Watering Holes map.
This was SVN commit r12050.
2012-07-01 04:15:02 +00:00
2921694346 Long skirt for Mauryan female.
This was SVN commit r12047.
2012-06-30 21:40:42 +00:00
28fbc77c45 Updated Mauryan civ json.
This was SVN commit r12046.
2012-06-30 03:52:30 +00:00
4899144d8a This was SVN commit r12045. 2012-06-30 02:13:40 +00:00
9e1310fed5 This was SVN commit r12044. 2012-06-30 00:31:03 +00:00
730263fa5e Mauryan female citizen.
This was SVN commit r12043.
2012-06-30 00:25:30 +00:00
1dc74dc2d7 Fixed up some Mauryan entities.
This was SVN commit r12042.
2012-06-29 23:39:05 +00:00
67e7953e3a Mauryan Elephant stables added
This was SVN commit r12041.
2012-06-29 19:16:13 +00:00
fe809e1deb Mauryan infantry archer template tweak
This was SVN commit r12040.
2012-06-29 18:32:12 +00:00
347eb964bd Fixed an error in description.
This was SVN commit r12039.
2012-06-29 04:14:06 +00:00
c3082fab9a Added Sahel Watering Holes random map.
This was SVN commit r12038.
2012-06-29 03:52:14 +00:00
4f60ef63c2 Fixed the starting angle on Oasis.
This was SVN commit r12037.
2012-06-29 03:20:40 +00:00
aa11c5bd90 Territory decay rate tech for Outposts
This was SVN commit r12036.
2012-06-29 00:02:04 +00:00
9536dbb898 Roman quinquereme ship animations
This was SVN commit r12035.
2012-06-28 21:10:59 +00:00
vts
78d90087a2 In RMS: Fix misaligned iberian bonus starting walls. Fix celt split civs errors. Add roads. Closes #1449.
This was SVN commit r12034.
2012-06-28 21:02:47 +00:00
c00abd4ab6 Update to Mauryan civ template and some new tech icons
This was SVN commit r12033.
2012-06-27 21:49:31 +00:00
0b55844452 Mauryan support elephant
This was SVN commit r12032.
2012-06-27 19:53:16 +00:00
d4a44a6128 Removes "demo" keyword from volcanic lands.
This was SVN commit r12031.
2012-06-27 10:45:09 +00:00
0c7a9d43d7 Prevents trees to block the view of players. Refs #1408.
This was SVN commit r12030.
2012-06-27 10:44:25 +00:00
4a1f417d40 Fixed a bug.
This was SVN commit r12029.
2012-06-27 10:22:05 +00:00