Compare commits

225 Commits

Author SHA1 Message Date
Ykkrosh a4637c25d0 Fix no-PCH builds
This was SVN commit r9786.
2011-07-08 15:07:08 +00:00
Pureon dff4add6a6 Making unfinished Neareastern Badlands map hidden
This was SVN commit r9784.
2011-07-07 23:25:53 +00:00
historic_bruno e0eed68835 Sets default single player map to Acropolis II (also moves these constants to the top of gamesetup.js for clarity)
This was SVN commit r9783.
2011-07-07 23:16:09 +00:00
Ykkrosh 1771545a3b Stop BuildingAI picking up messages for other components' range queries
This was SVN commit r9782.
2011-07-07 23:07:36 +00:00
historic_bruno e705e366d6 Fixes missing templates in Peloponnese map
This was SVN commit r9781.
2011-07-07 22:54:14 +00:00
Ykkrosh db9e05d83e Bump version number
This was SVN commit r9780.
2011-07-07 22:21:34 +00:00
Ykkrosh 58c33071d6 Disable unnecessary noisy AI greeting message
This was SVN commit r9779.
2011-07-07 22:18:55 +00:00
Ykkrosh 871d321050 Fix undefined property warning
This was SVN commit r9778.
2011-07-07 22:14:37 +00:00
Ykkrosh 6371afbc76 Remove the rarely-used source code option from the Windows installer. See #855.
This was SVN commit r9777.
2011-07-07 20:11:47 +00:00
Ykkrosh b6d04004b6 Avoid errors when using planes in formations, by not allowing them to join formations
This was SVN commit r9776.
2011-07-07 17:05:22 +00:00
Mythos_Ruler 519b0020ba Updated text from "Super" to "Champion."
This was SVN commit r9775.
2011-07-07 07:56:43 +00:00
Mythos_Ruler bc7991028b Preliminary Carthaginian stuff. Will move Carthage to Public very soon after Alpha VI release.
This was SVN commit r9774.
2011-07-07 06:58:26 +00:00
Mythos_Ruler fed5830189 Updated shield pattern.
This was SVN commit r9773.
2011-07-07 06:06:07 +00:00
Mythos_Ruler c1eb1c3b7a Fixed portrait.
This was SVN commit r9771.
2011-07-07 03:54:14 +00:00
Mythos_Ruler 65baa6d567 Quick update to Acropolis II
This was SVN commit r9770.
2011-07-07 03:18:30 +00:00
Ykkrosh 899f5105b9 Fix glwprintf errors on OS X with non-ASCII strings, by setting LC_CTYPE to UTF-8
This was SVN commit r9768.
2011-07-06 21:19:59 +00:00
Ykkrosh e9b3bcf467 Disable building Atlas by default on OS X
This was SVN commit r9766.
2011-07-06 20:14:25 +00:00
Jubal df9270a892 Hopefullyfixeslag.
This was SVN commit r9765.
2011-07-06 18:04:30 +00:00
historic_bruno 1bc2db56ea Stops unit following when other object selected. Fixes #775
This was SVN commit r9764.
2011-07-05 21:29:11 +00:00
Mythos_Ruler d2d631d2ed This was SVN commit r9763. 2011-07-05 06:00:52 +00:00
Mythos_Ruler ba52ff7604 made Triremes and Quinquiremes able to garrison siege engines.
Added some sound stuff to all siege weapons.

Tweaked siege tower.

This was SVN commit r9762.
2011-07-05 05:59:28 +00:00
Ykkrosh 315dfbff5d Fix use of outdated cached transform when computing bounding boxes.
Should fix #867.

This was SVN commit r9761.
2011-07-05 00:12:00 +00:00
historic_bruno c766f40da3 Changes Cantabrian Highlands random map to temperate biome
This was SVN commit r9760.
2011-07-04 23:54:04 +00:00
Pureon f8c62201b2 Siege tower update
This was SVN commit r9759.
2011-07-04 20:50:52 +00:00
Jubal 2763c7817d In theory, should make buildings point in the right direction.
This was SVN commit r9758.
2011-07-04 17:40:13 +00:00
Ykkrosh 528b833db0 Fix assertion failure in replay mode
This was SVN commit r9757.
2011-07-04 15:17:46 +00:00
Mythos_Ruler fc2b89a780 This was SVN commit r9756. 2011-07-03 23:23:01 +00:00
Mythos_Ruler 3c6789747b This was SVN commit r9755. 2011-07-03 22:32:26 +00:00
Mythos_Ruler 9d7a5da65a #New Thracian unit.
Tweaked Acropolis II.

This was SVN commit r9754.
2011-07-03 22:26:12 +00:00
Ykkrosh f01097b23c Avoid crash when pressing 'h' while multiplayer host game setup screen is loading
This was SVN commit r9753.
2011-07-03 18:36:43 +00:00
Jubal 4065cb1cd2 Few minor tweaks.
This was SVN commit r9750.
2011-07-03 09:43:31 +00:00
Jubal b4d0c09569 Building directions now 100% random. Can set it to a specific angle if we'd prefer, but someone needs to tell me what.
This was SVN commit r9749.
2011-07-03 08:46:30 +00:00
Mythos_Ruler c9b2273532 Fixed an error with the Iberian fortress.
This was SVN commit r9748.
2011-07-03 07:52:52 +00:00
Mythos_Ruler f138be6565 #New Greek shields patterns.
This was SVN commit r9747.
2011-07-03 06:10:02 +00:00
historic_bruno 972ca3cd22 Increases unit selection limit to 200 (equal to max population). See #789
This was SVN commit r9745.
2011-07-02 23:04:59 +00:00
Pureon 3da5afd8d5 Stop siege tower garrisoning itself inside itself
This was SVN commit r9744.
2011-07-02 22:52:17 +00:00
Mythos_Ruler 5c4b6e2320 Fixes #878
This was SVN commit r9743.
2011-07-02 22:26:51 +00:00
Mythos_Ruler 9b601d7ad4 Map updates to fix moved templates.
This was SVN commit r9741.
2011-07-02 17:47:23 +00:00
Mythos_Ruler 12eb4919be Stone and Metal added.
This was SVN commit r9740.
2011-07-02 17:17:07 +00:00
Jubal 9a6f90b90d This was SVN commit r9739. 2011-07-02 16:57:51 +00:00
Jubal 3756aaef48 This might help speed a fraction.
This was SVN commit r9738.
2011-07-02 16:49:26 +00:00
Jubal 6267a61962 This was SVN commit r9737. 2011-07-02 15:32:16 +00:00
Jubal 7bba760801 This was SVN commit r9736. 2011-07-02 15:29:20 +00:00
Jubal f1eb662cf6 This was SVN commit r9735. 2011-07-02 15:29:08 +00:00
Jubal 8612600a13 This was SVN commit r9734. 2011-07-02 15:27:35 +00:00
Pureon 5183a5d4de Mechanical siege tower update
This was SVN commit r9733.
2011-07-02 11:56:57 +00:00
Pureon 4139140916 # Giraffe, giraffe infant, lion, and lioness movement animations by Athos
This was SVN commit r9732.
2011-07-02 10:37:45 +00:00
Pureon f833529e63 skeletons xml update
This was SVN commit r9731.
2011-07-02 10:17:10 +00:00
Mythos_Ruler 885c220e9f This was SVN commit r9730. 2011-07-02 06:15:35 +00:00
Mythos_Ruler 8da4334a85 Re-skinned Belgian Bog.
This was SVN commit r9729.
2011-07-02 02:06:41 +00:00
Mythos_Ruler fa812a5ac5 A bunch of texture additions and changes, mostly to temperate terrains.
This was SVN commit r9728.
2011-07-02 02:04:15 +00:00
Mythos_Ruler 805dbe7640 Some new Greek shields.
This was SVN commit r9727.
2011-07-02 01:46:19 +00:00
historic_bruno 4d188452f8 Adds ownership checks to UI selections.
Adds ownership and diplomacy checks to Commands.js (fixes #880).
Adds control all units setting to Player component (network synced).
Adds helpers for diplomacy checks - use these instead of directly
accessing diplomacy array.
Fixes tests according to these changes.

This was SVN commit r9726.
2011-07-02 00:06:39 +00:00
historic_bruno 24f981cb2c Adds hack for random map data saved as typed arrays (see #658)
This was SVN commit r9725.
2011-06-30 23:09:59 +00:00
Mythos_Ruler 3dc70800ee Changed tooltip to reflect the current uselessness of this structure.
This was SVN commit r9724.
2011-06-30 21:56:51 +00:00
Mythos_Ruler c7fd1eaaf2 Tweaking some temperate terrains.
This was SVN commit r9723.
2011-06-29 04:49:25 +00:00
Mythos_Ruler 834271b878 Some updated maps.
This was SVN commit r9722.
2011-06-29 02:49:41 +00:00
historic_bruno 6ba00117e0 Fixes bug in Atlas player editor: saving team as "None" had no effect
This was SVN commit r9721.
2011-06-29 00:57:02 +00:00
Ykkrosh 996a32125c Add per-player LOS-reveal flag.
Reveal LOS for Gaia and AI players (fixes #879).
Use player_id_t slightly more consistently in interfaces.

This was SVN commit r9720.
2011-06-28 23:24:42 +00:00
janwas d9c944c975 fix one last super_unit - at least given the following search criteria:
Find all "super_unit", Match case, Subfolders, Find Results 1,
"0ad\svn\binaries\data", "*.xml;*.xsl;*.xslt;*.xsd;*.dtd"
0ad\svn\binaries\data\mods\public\art\actors\units\celts\boudicca_chariot.xml(16):
<prop actor="units/celts/super_unit_4_d.xml" attachpoint="driver"/>

This was SVN commit r9717.
2011-06-28 19:32:49 +00:00
Pureon 7ee28348ec Garrison multiplier for hele siege tower
This was SVN commit r9716.
2011-06-28 19:11:46 +00:00
Ykkrosh 709260e339 Fix occasional script error with planes
This was SVN commit r9715.
2011-06-28 18:26:29 +00:00
Ykkrosh 151539a92b Fix #882 (test failure)
This was SVN commit r9714.
2011-06-28 18:25:38 +00:00
Chakakhan 293adad0ba Fix #829 - Stuck units bug
This was SVN commit r9713.
2011-06-28 07:27:03 +00:00
Mythos_Ruler da79f8edbe Last Champion fix. Or is it? <_<
This was SVN commit r9712.
2011-06-28 04:46:44 +00:00
Mythos_Ruler f0c2c15d3f Champion fix for this unit.
This was SVN commit r9711.
2011-06-28 04:42:02 +00:00
Mythos_Ruler 7f79dcd379 Champion FIX for maps.
This was SVN commit r9710.
2011-06-28 04:28:09 +00:00
Mythos_Ruler 91a972238a Champion FIXES commit.
This was SVN commit r9709.
2011-06-28 04:19:01 +00:00
Mythos_Ruler 520788cafb Champions. Commit #3.
This was SVN commit r9708.
2011-06-28 04:02:54 +00:00
Mythos_Ruler ac0576f326 Champions. Commit #2.
This was SVN commit r9707.
2011-06-28 03:56:04 +00:00
Mythos_Ruler 75c1ae84d5 This was SVN commit r9706. 2011-06-28 03:30:35 +00:00
Mythos_Ruler d8725c1df7 This was SVN commit r9705. 2011-06-28 03:29:12 +00:00
Mythos_Ruler f3fe7aaa67 Changing nomenclature from "Super Units" to "Champions." Commit Part 1.
This was SVN commit r9704.
2011-06-28 03:24:50 +00:00
Mythos_Ruler c2f9496a4f Temp solution to Ship finished sound.
This was SVN commit r9703.
2011-06-28 01:52:40 +00:00
Mythos_Ruler f4e773f7ba Celt Temple costs Wood, not Stone.
Greek Fortress builds the new Greek siege tower.

Females have order acknowledgments. This is a temp solution until we
have dedicated female sounds.

Added verbal acknowledgments to the Priests as well.

Siege Tower stat tweaks.

This was SVN commit r9702.
2011-06-28 01:50:42 +00:00
Mythos_Ruler 85e49e9d13 Fixed a team error on the map.
This was SVN commit r9701.
2011-06-28 01:30:58 +00:00
WhiteTreePaladin 7baab8e221 Moved stances and idle worker button to more appropriate locations
This was SVN commit r9700.
2011-06-28 01:09:55 +00:00
historic_bruno a8fdcfde59 Fixes broken autostart for random maps with AI
This was SVN commit r9699.
2011-06-27 23:27:25 +00:00
Mythos_Ruler bdde44d9aa Balancing war elephants.
This was SVN commit r9698.
2011-06-27 22:43:36 +00:00
Pureon a7ea5ed3ae Hele siege tower basic setup
This was SVN commit r9697.
2011-06-27 22:43:03 +00:00
Mythos_Ruler 20030f1515 This was SVN commit r9696. 2011-06-27 22:41:17 +00:00
Mythos_Ruler d78d4f7169 # Moved Roman and Carthaginian Champion Units to Public.
This was SVN commit r9695.
2011-06-27 22:23:03 +00:00
Mythos_Ruler c276a45fae Tweaked Greek Farmstead and Gymnasion.
This was SVN commit r9694.
2011-06-27 21:45:37 +00:00
Pureon 552d81e1c9 Temple select OGG file update
This was SVN commit r9693.
2011-06-27 20:01:44 +00:00
Pureon aef4db11c0 Sound effects for wall gate
This was SVN commit r9691.
2011-06-27 19:56:29 +00:00
Mythos_Ruler f044c7f6df This was SVN commit r9690. 2011-06-27 06:55:13 +00:00
Mythos_Ruler c8f63fc366 Updated license wording for CGTextures.
This was SVN commit r9689.
2011-06-27 05:47:25 +00:00
Mythos_Ruler 0ff7997d9f Moving the last of the terrains.
This was SVN commit r9688.
2011-06-27 05:39:53 +00:00
Mythos_Ruler 2c9835cbc4 Moving and deleting terrains.
This was SVN commit r9687.
2011-06-27 05:11:17 +00:00
Mythos_Ruler 27b68a5a88 Deleting from Internal
This was SVN commit r9686.
2011-06-27 04:51:29 +00:00
Mythos_Ruler 25bbfb81c4 This was SVN commit r9685. 2011-06-27 04:50:25 +00:00
Mythos_Ruler 89d388669d This was SVN commit r9684. 2011-06-27 04:28:30 +00:00
Mythos_Ruler 2e1200fa8c This was SVN commit r9683. 2011-06-27 04:27:08 +00:00
Mythos_Ruler 0503fea0d8 This was SVN commit r9682. 2011-06-27 04:25:11 +00:00
Mythos_Ruler 45017504aa This was SVN commit r9681. 2011-06-27 04:22:18 +00:00
Mythos_Ruler 9da83a992e Renaming and deleting some terrains, preparing to move to Public.
This was SVN commit r9680.
2011-06-27 04:17:28 +00:00
Mythos_Ruler b43ca11379 This was SVN commit r9679. 2011-06-27 03:29:34 +00:00
Mythos_Ruler 577aaedc7c Portrait for plane.
This was SVN commit r9678.
2011-06-27 00:41:50 +00:00
Mythos_Ruler a47ef2060a Updated the Plane entity.
This was SVN commit r9677.
2011-06-27 00:32:28 +00:00
Mythos_Ruler a64f1356cb P-51 Mustang
This was SVN commit r9676.
2011-06-27 00:26:33 +00:00
Pureon ff1277d4d8 Barracks select sound fix
This was SVN commit r9675.
2011-06-26 22:46:29 +00:00
Pureon 421df0a53c Selection sound effect xml files updated
This was SVN commit r9674.
2011-06-26 22:36:18 +00:00
Ykkrosh 31832cd9ae Initialise minimap and LOS textures properly
This was SVN commit r9673.
2011-06-26 21:47:07 +00:00
Ykkrosh 3f51747440 Fix uninitialised value
This was SVN commit r9672.
2011-06-26 21:45:58 +00:00
Pureon 9901f47065 Universal select audio file update
This was SVN commit r9671.
2011-06-26 21:06:23 +00:00
Pureon cc70aacdb7 Added new building constructed and selected sound effects
This was SVN commit r9670.
2011-06-26 21:01:16 +00:00
Ykkrosh 1f20444e4c Trigger 'constructed' sound when a building finishes construction
This was SVN commit r9669.
2011-06-26 18:27:10 +00:00
Chakakhan df2e499efc Post code review version - previous commit was pre code review version.
This was SVN commit r9666.
2011-06-26 07:47:03 +00:00
Chakakhan 2aedf48304 #788 Eliminate delay in path finding (and therefore moving)
This was SVN commit r9665.
2011-06-26 07:03:08 +00:00
historic_bruno 5bc125a91f Changes terrain data returned by CMapGenerator to typed arrays, instead of an array of objects (this greatly reduces the size of the serialized data)
This was SVN commit r9664.
2011-06-26 02:56:54 +00:00
Badmadblacksad d89eafaf83 stances improvement and bugfixing. units now targets buildings last, after workers, and after every other units.
This was SVN commit r9663.
2011-06-26 02:03:36 +00:00
Mythos_Ruler 95756627ec New aeroplane stuff.
Polishing up the Persian cataphract.

More edits to Peloponnese map.

This was SVN commit r9662.
2011-06-25 20:57:06 +00:00
Badmadblacksad fed56af8a7 avoid trying to attack (before gathering) for ever an animal which is not visible anymore (bug not yet met because unlikely)
This was SVN commit r9661.
2011-06-25 20:56:46 +00:00
Badmadblacksad c8b0d7c11c fix a small bug related to units stances and gathering
This was SVN commit r9660.
2011-06-25 19:14:08 +00:00
historic_bruno 8bdc1b0882 Enforces max population limit, cleans up population variables in Player component. See #862
Max population defaults to 200

This was SVN commit r9659.
2011-06-25 00:47:46 +00:00
historic_bruno 33e8ac6fa5 Applies Kenny's patch for CInput pasting behavior (fixes #640)
Simplifies some clipboard hotkeys

This was SVN commit r9658.
2011-06-25 00:04:41 +00:00
Ykkrosh 92fcb737cd Attempt minor improvements to stances code (see #865).
Don't chase units that are no longer visible, beyond where they were
last seen (fixes #595).

This was SVN commit r9657.
2011-06-24 12:35:15 +00:00
Mythos_Ruler 4e809a02e8 Moving some prop actors over.
This was SVN commit r9656.
2011-06-24 05:49:22 +00:00
Mythos_Ruler 1bf469755f This was SVN commit r9655. 2011-06-24 05:19:23 +00:00
Mythos_Ruler 99f9d3f159 Bunch of helmet fixes and random other stuff.
This was SVN commit r9654.
2011-06-24 05:18:28 +00:00
Mythos_Ruler 94460f6994 Moved the rest of the props to Public with MOVE command.
Moved Persian Cataphract and War Elephant to Public.

This was SVN commit r9653.
2011-06-24 04:25:02 +00:00
Mythos_Ruler 53d1293da9 Added treasures and other stuff to Peloponnese.
This was SVN commit r9652.
2011-06-24 03:28:54 +00:00
Mythos_Ruler 90a06957e9 This was SVN commit r9651. 2011-06-24 02:49:06 +00:00
Mythos_Ruler 1ce1cfea45 Hero Stars
This was SVN commit r9650.
2011-06-24 02:45:49 +00:00
historic_bruno 195c7a00e9 Adds player settings shortcut to Atlas map panel. Fixes #874
Tweaks some control positions and layouts for consistency

This was SVN commit r9649.
2011-06-23 22:38:26 +00:00
Mythos_Ruler bd80c1ea42 Stars for public heroes *(to be replaced with something better in the future).
This was SVN commit r9648.
2011-06-23 21:26:59 +00:00
Ykkrosh 05898c75d1 # Increase maximum camera distance
This was SVN commit r9647.
2011-06-23 12:52:43 +00:00
janwas 492e49da38 add support for selection and deletion of entire words in text controls (ctrl+backspace/delete/left/right) based on patch by Chakakhan/kenny (thanks!)
also refactored wclipboard
closes #511

This was SVN commit r9646.
2011-06-23 10:12:43 +00:00
historic_bruno 889f4698f2 Moves population bonus to new line in construction tooltip (based on patch from pejuko). Fixes #873
This was SVN commit r9645.
2011-06-22 21:11:37 +00:00
Mythos_Ruler b99b37387b Updated cliff texture. Updated Peloponnese map.
This was SVN commit r9644.
2011-06-22 04:05:42 +00:00
historic_bruno abdc846a65 Adds getInt to AtlasObject
Uses this instead of wxAtoi for consistency, and adds brief comment
about why wxAtof should be avoided

This was SVN commit r9643.
2011-06-21 02:56:49 +00:00
janwas ef4df42895 add support for .dylib on OS X based on patch by Yves (thanks!)
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14173&pid=220828&st=0&#entry220828

This was SVN commit r9642.
2011-06-20 20:06:51 +00:00
Mythos_Ruler d41e859b67 #Updated Iberian Corral by Zaggy.
This was SVN commit r9641.
2011-06-20 05:57:45 +00:00
Mythos_Ruler 5005398619 Update to the Peloponnese map. Still incomplete.
This was SVN commit r9640.
2011-06-20 05:57:28 +00:00
Ykkrosh 10481ca174 Avoid potentially dangerous locale-dependent atof functions
This was SVN commit r9639.
2011-06-19 19:51:53 +00:00
Mythos_Ruler 9b930d9617 Test 'selected' stance icon
This was SVN commit r9638.
2011-06-19 19:02:32 +00:00
Ykkrosh 9965c1ef1b Remove label that is no longer labelling anything
This was SVN commit r9636.
2011-06-19 14:55:43 +00:00
Ykkrosh db5e483266 Fix typo in comment
This was SVN commit r9635.
2011-06-19 14:18:07 +00:00
historic_bruno 74f849ad0b Adds message when profiler snapshot is first saved (Shift+F11)
This was SVN commit r9633.
2011-06-17 23:40:13 +00:00
Badmadblacksad e01917b961 Entities faces toward themself. fixed.
This was SVN commit r9632.
2011-06-17 23:08:46 +00:00
Badmadblacksad 71a6775b92 Stances draft, refs #865
This was SVN commit r9631.
2011-06-17 22:13:39 +00:00
Mythos_Ruler 032794b7c8 This was SVN commit r9629. 2011-06-16 22:58:14 +00:00
Mythos_Ruler 578936d7d0 Moved all the Skies to Public.
This was SVN commit r9628.
2011-06-16 22:31:02 +00:00
Mythos_Ruler 86505030cb Made huntable animals easier to kill. We may change this again later, so we can have some hunting techs.
This was SVN commit r9627.
2011-06-16 22:21:37 +00:00
Mythos_Ruler 0dcaa3d9a1 Greece real-world map. Work-In-Progress.
This was SVN commit r9626.
2011-06-16 22:03:26 +00:00
Mythos_Ruler 3a9f7b9884 Some terrain texture updates and moves.
This was SVN commit r9625.
2011-06-16 21:44:08 +00:00
Mythos_Ruler 80391fc30a Cleaning out bad textures. Preparing to move the rest of the good ones to Public.
This was SVN commit r9624.
2011-06-16 21:32:36 +00:00
historic_bruno 3be43ede41 Adds rotation to starting camera (currently unused)
This was SVN commit r9623.
2011-06-16 21:21:33 +00:00
Mythos_Ruler 2fa7c8aeca Moving terrain assets to Public.
This was SVN commit r9622.
2011-06-16 20:12:55 +00:00
historic_bruno 9e486cd6e3 Fixes bug in Atlas camera control (clear button didn't erase the setting)
This was SVN commit r9620.
2011-06-14 01:03:35 +00:00
historic_bruno 3e4d74480d Adds AI control to Atlas player panel
Adds camera control to Atlas player panel
Changes map reader to handle per-player starting camera position. See
#55
Adds entity name filter to Atlas object panel
Fixes bug in Atlas map settings (caused crash when object panel was not
loaded)

This was SVN commit r9617.
2011-06-13 23:32:41 +00:00
WhiteTreePaladin 7e1cbf6ece increase length of main menu version number field to accommodate longer version text
This was SVN commit r9616.
2011-06-11 14:22:03 +00:00
historic_bruno 29edc1b8e9 Delete previous player icon and use Michael's
This was SVN commit r9615.
2011-06-10 21:32:09 +00:00
Mythos_Ruler 543c02c149 This was SVN commit r9614. 2011-06-10 19:16:04 +00:00
Mythos_Ruler ec1e1a4042 Undo and redo icons for Atlas.
This was SVN commit r9613.
2011-06-10 19:00:59 +00:00
Mythos_Ruler b3e7b80b68 New players icon.
This was SVN commit r9612.
2011-06-10 18:50:47 +00:00
historic_bruno 4a3230a870 This was SVN commit r9610. 2011-06-09 23:52:29 +00:00
historic_bruno 0c803f99e8 This was SVN commit r9609. 2011-06-09 23:47:20 +00:00
historic_bruno 23f1072a2e Adds player editor to Atlas scenario editor. See #91
Fixes object panel so the list of players updates correctly.
Atlas map settings are now observable and shared between various panels.
Fixes panels for maps missing settings (caused JSON error)
Changes map reader so that entities with invalid players cause a warning
but are not added to the game. That prevents further errors. Fixes #869
Uses map size choices from simulation/data/map_sizes.json instead of
multiple locations. Fixes #787
Prepares Atlas map settings for undo/redo support

This was SVN commit r9608.
2011-06-09 23:45:12 +00:00
Ykkrosh 266977bc78 Attempt to fix manifest problems in autobuild.
This was SVN commit r9607.
2011-06-09 23:16:27 +00:00
Ykkrosh 2c58b07223 # Add experimental fighter planes.
This was SVN commit r9605.
2011-06-09 19:44:40 +00:00
Ykkrosh 1357000401 Fix #805 more so it doesn't ignore the second click on non-double-clickable buttons.
This was SVN commit r9604.
2011-06-09 17:30:34 +00:00
Ykkrosh 7b8a33f374 Fix tests.
This was SVN commit r9603.
2011-06-09 17:15:01 +00:00
Ykkrosh 5132f814e3 Clean up some formatting and comments.
This was SVN commit r9602.
2011-06-09 17:01:01 +00:00
Ykkrosh 902b33a181 Remove redundant code for animal fleeing, and don't omit expected arguments.
This was SVN commit r9601.
2011-06-09 16:41:55 +00:00
Ykkrosh 28d952404e Improve selection details debug display.
This was SVN commit r9600.
2011-06-09 16:40:29 +00:00
Ykkrosh 8720b4a220 Fix Atlas saving game type under wrong property name.
This was SVN commit r9599.
2011-06-09 16:39:31 +00:00
Mythos_Ruler 8eadd4e25f #Ship balance.
This was SVN commit r9598.
2011-06-09 05:06:34 +00:00
Mythos_Ruler 24b0e1cafb This was SVN commit r9597. 2011-06-08 21:12:57 +00:00
Mythos_Ruler f1c1f400c9 Lots of Helmet stuff.
This was SVN commit r9596.
2011-06-08 07:18:52 +00:00
Badmadblacksad 24cca252e3 Ranged units always face their targets when attacking. fixes #831
This was SVN commit r9595.
2011-06-06 22:08:26 +00:00
Badmadblacksad 43d817bc22 --
This was SVN commit r9593.
2011-06-06 19:39:19 +00:00
Badmadblacksad 9906a86a2e Support double-click on unit group buttons. patch by Merolum. fixes #805.
This was SVN commit r9592.
2011-06-06 19:31:34 +00:00
Mythos_Ruler 6b0cbd10c3 Finished the new Cycladic Archipelago map.
Added promotion animations to some units.

Added triple-click to Hypaspists and Roman Legions.

This was SVN commit r9591.
2011-06-06 00:46:58 +00:00
Mythos_Ruler 18dd17ea4a fixed a Scipio animation problem. Edited some Roman stuff.
This was SVN commit r9590.
2011-06-05 23:54:01 +00:00
Mythos_Ruler d0560bd93e Playtesting a water map, I came to the conclusion that ships took way too long to build.
This was SVN commit r9589.
2011-06-05 20:38:01 +00:00
Badmadblacksad 304d4e82f0 (minor) fix an animation event value
This was SVN commit r9588.
2011-06-05 20:03:44 +00:00
Mythos_Ruler d892403f90 Adjusted the look of the Persian temple.
This was SVN commit r9587.
2011-06-05 05:57:28 +00:00
Mythos_Ruler 091cba16c6 Flipped the Iberian Civ Centre so it faces the correct way.
This was SVN commit r9585.
2011-06-05 01:52:25 +00:00
Mythos_Ruler 916b4b7e92 Pureon's map, with my edits. Now turning it back over to him for his own edits.
This was SVN commit r9584.
2011-06-04 04:19:36 +00:00
Mythos_Ruler 97528d25f1 This was SVN commit r9583. 2011-06-04 03:14:49 +00:00
janwas 6feb143e61 OS X compile fix
This was SVN commit r9582.
2011-05-30 23:06:16 +00:00
janwas ef74ad7f7b OS X compile fix (hopefully): add definition for O_DIRECT
This was SVN commit r9581.
2011-05-30 21:49:33 +00:00
janwas 034881d30c sync with work. simplify wnuma, refactor+fix topology (bugs: APIC IDs array didn't correspond to OS processor number; couldn't handle noncontiguous APIC ID field values)
This was SVN commit r9580.
2011-05-30 13:00:20 +00:00
Ykkrosh f25407e7fb Fix typo
This was SVN commit r9579.
2011-05-30 11:51:14 +00:00
Mythos_Ruler 8ecf3aa1b5 Bumped up the Wood in trees from 150 to 200.
Reoriented the Carthaginian House C to face South East.

Working on a new version of Cycladic Archipelago II.

This was SVN commit r9578.
2011-05-30 01:50:49 +00:00
Ykkrosh ce647cf8e3 Add a manifest hack to fix building in VC2008+, when loading DLLs built in VC2005
This was SVN commit r9576.
2011-05-29 21:13:21 +00:00
Ykkrosh 59124006c8 Work around problem with quote keys in Windows on an Apple machine
This was SVN commit r9575.
2011-05-29 21:12:09 +00:00
Ykkrosh c2677b4bb0 Upgrade game and build system to ENet 1.3
This was SVN commit r9574.
2011-05-29 20:57:28 +00:00
janwas e3d87b0375 remove no longer necessary lowlevel wsock implementation (superseded by enet) since the delay load hook isn't compatible with a DLL packaging of enet.
-> cstr serialization uses lib/byte_order.h instead of htons; removed
hostname/IP from system_info (Philip agrees its utility is negligible)

This was SVN commit r9572.
2011-05-29 19:59:51 +00:00
Ykkrosh acb48663d7 Windows fixes
This was SVN commit r9570.
2011-05-29 18:14:52 +00:00
Ykkrosh 6bdafee6a0 Update Atlas sidebar buttons slightly
This was SVN commit r9569.
2011-05-29 16:36:15 +00:00
Ykkrosh fa7855f3d9 Delete now-unused wxJavaScript library
This was SVN commit r9568.
2011-05-29 15:46:07 +00:00
Ykkrosh a81f180dd6 Remove Atlas UI scripting support
This was SVN commit r9567.
2011-05-29 15:43:08 +00:00
Ykkrosh dc2035efc9 Move Atlas map settings from JS to C++.
Replace New dialog box with separate tools for resizing maps and
replacing terrain textures, to provide more power and to simplify the
problem of initialising map settings.
Fix engine to cope with dynamic map resizing.
Add JSON support to AtObj, to let C++ interact with JSON more easily.

This was SVN commit r9566.
2011-05-29 15:02:02 +00:00
Ykkrosh 1618aa9c36 Add missing file for actor viewer
This was SVN commit r9565.
2011-05-29 14:57:54 +00:00
Mythos_Ruler f1c4904071 Map tweaks.
Rain particle experiment.

This was SVN commit r9564.
2011-05-28 21:21:36 +00:00
Mythos_Ruler ea36fdad2d New forestfloor texture for Mediterranean biome.
This was SVN commit r9563.
2011-05-28 16:56:59 +00:00
Mythos_Ruler bb5a66ac35 Moved Gambia River map to Public.
Moved Fog sky to Public.
Made separate fish entities.

This was SVN commit r9562.
2011-05-28 03:16:26 +00:00
Mythos_Ruler 0f616d42c6 This was SVN commit r9561. 2011-05-28 03:09:40 +00:00
Mythos_Ruler 9b70228997 Updated the terrains of The Massacre of Delphi.
New "Gambia River" map using Tropic terrains.

This was SVN commit r9560.
2011-05-28 02:47:17 +00:00
Ykkrosh 07e307c49a Move Atlas's terrain and object sections from JS back into C++, per http://www.wildfiregames.com/forum/index.php?showtopic=14741
This was SVN commit r9559.
2011-05-27 21:56:43 +00:00
Ykkrosh 4496fcd2df Restore some old Atlas files
This was SVN commit r9558.
2011-05-27 21:48:23 +00:00
Ykkrosh 755802d0ce Fix build errors
This was SVN commit r9556.
2011-05-27 13:32:34 +00:00
historic_bruno 5da713af2f Removes debugging output from Latium rms
This was SVN commit r9555.
2011-05-27 03:55:01 +00:00
historic_bruno 1bf2598429 Fixes square maps to behave like circular maps and fit within the circle. Fixes #822
This was SVN commit r9554.
2011-05-27 03:04:59 +00:00
Mythos_Ruler 293f7cbae0 This was SVN commit r9553. 2011-05-26 03:16:14 +00:00
Mythos_Ruler a3705a7d11 Updated SMOKE particles. They look much much nicer now. Enjoy!
This was SVN commit r9552.
2011-05-26 02:27:34 +00:00
Mythos_Ruler 2c05745c7d Flipped the Celt Barracks so it points to the "front" where units come out.
This was SVN commit r9551.
2011-05-26 00:44:58 +00:00
janwas 34186dd017 refactor file interface. requires workspace update
- separate file_system_util into vfs functions (-> vfs/vfs_util) and
file_system (avoids ugly fs_util namespace prefix)
- get rid of non-portable O_BINARY_NP etc. flags
- use standard O_WRONLY etc. flags instead of LIO_WRITE; but avoid the
need for specifying O_CREAT|O_TRUNC
- only open files for aio when O_DIRECT is specified (which 0ad does
not) - avoids wasting time and security issues
- return file descriptor directly instead of via output param
- waio: safer FCB mechanism that avoids mixing descriptors between lowio
and aio

This was SVN commit r9550.
2011-05-25 10:39:13 +00:00
Mythos_Ruler ceea205782 This was SVN commit r9549. 2011-05-25 05:45:49 +00:00
janwas 7600c3862b refactor gfx detection code (interface), allow exporting from DLL (required at work)
This was SVN commit r9546.
2011-05-24 14:17:47 +00:00
janwas f1a1f023df reinstate aligned_allocator.h (required at work)
further fixes to preserve the last error while building error messages
somewhat more accurate NUMA factor computation

This was SVN commit r9545.
2011-05-23 14:10:45 +00:00
Mythos_Ruler d7f4935dce This was SVN commit r9544. 2011-05-23 01:50:45 +00:00
Mythos_Ruler 2239a261ee Last new Greek house variant.
This was SVN commit r9543.
2011-05-23 01:48:22 +00:00
Mythos_Ruler 003037e102 Moves "new" terrains elsewhere and reverted the Medit terrains back. I wasn't happy with how the new ones were blending with all the other textures and realized I'd have to redo all the others as well.
This was SVN commit r9542.
2011-05-22 01:59:15 +00:00
Mythos_Ruler 501f72ec0c Map updates. Terrain updates.
This was SVN commit r9541.
2011-05-21 05:51:28 +00:00
Mythos_Ruler 171917d0c6 Terrain updates
This was SVN commit r9540.
2011-05-21 02:21:38 +00:00
Mythos_Ruler 2c6fc32a57 This was SVN commit r9539. 2011-05-20 19:37:59 +00:00
Mythos_Ruler 2f94551716 New Greek house by Privateer! Good work. Test "hero star" for Themistocles.
This was SVN commit r9537.
2011-05-20 15:48:12 +00:00
Ykkrosh 84030de9b7 Fix compile error with Boost 1.39 (ambiguous overloads)
This was SVN commit r9536.
2011-05-20 14:45:04 +00:00
Mythos_Ruler 608db46c16 Tweaks to the map
This was SVN commit r9535.
2011-05-18 20:17:42 +00:00
Ykkrosh 1075e206f7 Fix some format string errors
This was SVN commit r9534.
2011-05-18 19:10:36 +00:00
Badmadblacksad 069f567f7e check that enemy units don't leave foundations. based on patch from Stork. fixes #724
This was SVN commit r9532.
2011-05-17 20:30:21 +00:00
Badmadblacksad 1fac936d68 fixes a bug related to foundations and animals corpses (previously, when an animal has already been ordered to leave a foundation once, it will not leave the construction site if you place an another building on top of it).
This was SVN commit r9531.
2011-05-17 16:26:47 +00:00
1987 changed files with 11487 additions and 77482 deletions
+14 -5
View File
@@ -82,7 +82,7 @@ view.drag.speed = 0.5
view.zoom.speed = 256.0
view.zoom.speed.wheel = 32.0
view.zoom.min = 96.0
view.zoom.max = 256.0
view.zoom.max = 512.0
view.zoom.default = 192.0
view.pos.smoothness = 0.1
view.zoom.smoothness = 0.4
@@ -127,8 +127,11 @@ hotkey.camera.down = S, DownArrow ; Scroll or rotate dow
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console
hotkey.console.copy = "Ctrl+C" ; Copy from console to clipboard
hotkey.console.paste = "Ctrl+V" ; Paste clipboard to console
; > CLIPBOARD CONTROLS
hotkey.copy = "Ctrl+C" ; Copy to clipboard
hotkey.paste = "Ctrl+V" ; Paste from clipboard
hotkey.cut = "Ctrl+X" ; Cut selected text and copy to the clipboard
; > ENTITY SELECTION
hotkey.selection.add = Shift ; Add units to selection
@@ -174,8 +177,8 @@ hotkey.session.batchtrain = Shift ; Modifier to train units in batches
hotkey.session.deselectgroup = Ctrl ; Modifier to deselect units when clicking group icon, instead of selecting
hotkey.session.rotate.cw = RightBracket ; Rotate building placement preview clockwise
hotkey.session.rotate.ccw = LeftBracket ; Rotate building placement preview anticlockwise
hotkey.timewarp.fastforward = Space
hotkey.timewarp.rewind = Backspace
hotkey.timewarp.fastforward = Space ; If timewarp mode enabled, speed up the game
hotkey.timewarp.rewind = Backspace ; If timewarp mode enabled, go back to earlier point in the game
; > OVERLAY KEYS
hotkey.fps.toggle = "Shift+F" ; Toggle frame counter
@@ -186,6 +189,12 @@ hotkey.menu.toggle = "F10" ; Toggle in-game menu
; > HOTKEYS ONLY
hotkey.chat = Return ; Toggle chat window
; > GUI TEXTBOX HOTKEYS
hotkey.text.delete.left = "Ctrl+Backspace" ; Delete word to the left of cursor
hotkey.text.delete.right = "Ctrl+Del" ; Delete word to the right of cursor
hotkey.text.move.left = "Ctrl+LeftArrow" ; Move cursor to start of word to the left of cursor
hotkey.text.move.right = "Ctrl+RightArrow" ; Move cursor to start of word to the right of cursor
; > PROFILER
hotkey.profile.toggle = "F11" ; Enable/disable real-time profiler
hotkey.profile.save = "Shift+F11" ; Save current profiler data to logs/profile.txt
@@ -10,6 +10,7 @@
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<TurnRate>6.0</TurnRate>
</Position>
<UnitAI/>
</Entity>
@@ -10,6 +10,7 @@
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<TurnRate>6.0</TurnRate>
</Position>
<UnitAI/>
<Footprint>
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="base">
<mesh>props/shield/round_s_f.pmd</mesh>
<props>
<prop actor="props/units/shields/round_back.xml" attachpoint="back"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Shield-Numidian-1">
<texture>props/shield/kart_round_b.dds</texture>
</variant>
<variant frequency="1" name="Shield-Numidian-2">
<texture>props/shield/kart_round_r.dds</texture>
</variant>
<variant frequency="1" name="Shield-Numidian-3">
<texture>props/shield/kart_round_t.dds</texture>
</variant>
</group>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<group>
<variant frequency="1" name="base">
<mesh>props/shield/round_b_f.pmd</mesh>
<props>
<prop actor="props/units/shields/round_back.xml" attachpoint="back"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Shield-Numidian-Adv">
<texture>props/shield/kart_round_s.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="base">
<mesh>props/shield/round_b_f.pmd</mesh>
<props>
<prop actor="props/units/shields/round_back.xml" attachpoint="back"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Shield-Numidian-Leopard">
<texture>props/shield/kart_round_u.dds</texture>
</variant>
<variant frequency="1" name="Shield-Numidian-Orynx">
<texture>props/shield/kart_round_v.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -12,7 +10,6 @@
<animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
<animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
<animation file="quadraped/horse_death.psa" name="death" speed="230"/>
<animation file=""/>
</animations>
<mesh>skeletal/horse.pmd</mesh>
<props>
@@ -20,7 +17,6 @@
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Horse-Texture-Plain">
<texture>skeletal/horse_kart_cjv_b_1.dds</texture>
@@ -32,7 +28,6 @@
<texture>skeletal/horse_kart_cjv_b_3.dds</texture>
</variant>
</group>
<group>
<variant frequency="1" name="horse-color-gray">
<colour>238 232 204</colour>
@@ -44,7 +39,5 @@
<colour>254 214 129</colour>
</variant>
</group>
<material>objectcolor.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -19,7 +17,6 @@
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Horse-Texture-Plain">
<texture>skeletal/horse_kart_cjv_b_1.dds</texture>
@@ -31,7 +28,6 @@
<texture>skeletal/horse_kart_cjv_b_3.dds</texture>
</variant>
</group>
<group>
<variant frequency="1" name="horse-color-gray">
<colour>238 232 204</colour>
@@ -43,7 +39,5 @@
<colour>254 214 129</colour>
</variant>
</group>
<material>objectcolor.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
@@ -23,7 +21,5 @@
<texture>skeletal/kart_cjv_b_1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -19,10 +17,10 @@
<prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
<prop actor="props/units/heads/samnite_test.xml" attachpoint="helmet"/>
<prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
<prop actor="props/units/shields/cart_tarantine_a.xml" attachpoint="shield"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="pectoral-tripledisc">
<texture>skeletal/kart_csp_a_1.dds</texture>
@@ -31,7 +29,5 @@
<texture>skeletal/kart_csp_e_1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -17,19 +15,17 @@
<mesh>skeletal/m_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
<prop actor="props/units/heads/samnite_a.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/samnite_elite.xml" attachpoint="helmet"/>
<prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
<prop actor="props/units/cape_m_med.xml" attachpoint="shoulders"/>
<prop actor="props/units/shields/cart_tarantine_e.xml" attachpoint="shield"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="texture">
<texture>skeletal/kart_csp_e_3.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -18,16 +16,22 @@
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="units/carthaginians/hero_hamilcar_r.xml" attachpoint="rider"/>
<prop actor="props/units/hero_star.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="horse-texture-1">
<texture>skeletal/horse_kart_hamilcar.dds</texture>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Death">
<props>
<prop attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Mesh">
<animations>
@@ -20,16 +18,22 @@
<prop actor="units/carthaginians/hero_hannibal_mahout.xml" attachpoint="rider1"/>
<prop actor="props/units/turret_hannibal.xml" attachpoint="turret"/>
<prop actor="props/units/heads/elephant_tuskball_1.xml" attachpoint="head"/>
<prop actor="props/units/hero_star.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="elephant-armour-1">
<texture>skeletal/kart_hero_hannibal_mount.dds</texture>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Death">
<props>
<prop attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
<animation file="biped/not used/inf_salute_a.psa" name="Idle" speed="1"/>
<animation file="biped/not used/inf_salute_d.psa" name="Walk" speed="2"/>
<animation file="biped/not used/inf_salute_e.psa" name="Walk" speed="2"/>
<animation file="biped/not used/inf_salute_e.psa" name="run" speed="100"/>
<animation event="" file="biped/not used/inf_salute_d.psa" name="melee" speed="1"/>
<animation file="biped/inf_salute_a.psa" name="Idle" speed="50"/>
<animation file="biped/inf_salute_d.psa" name="Walk" speed="50"/>
<animation file="biped/inf_salute_e.psa" name="Walk" speed="50"/>
<animation file="biped/inf_salute_e.psa" name="run" speed="65"/>
<animation event="" file="biped/inf_salute_d.psa" name="melee" speed="65"/>
<animation file="biped/rider_sword_death_a.psa" name="death" speed="200"/>
</animations>
<mesh>skeletal/m_tunic_long.dae</mesh>
@@ -23,7 +21,5 @@
<texture>skeletal/kart_hero_hannibal.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -18,16 +16,22 @@
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="units/carthaginians/hero_maharbal_r.xml" attachpoint="rider"/>
<prop actor="props/units/hero_star.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="horse-texture-1">
<texture>skeletal/horse_kart_maharbal.dds</texture>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Death">
<props>
<prop actor="props/units/hero_star.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
@@ -14,7 +12,7 @@
</animations>
<mesh>skeletal/m_tunic_long.dae</mesh>
<props>
<prop actor="props/units/heads/rome_helmet_csp_e.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/rome_cav_e.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/rome_head_veteran.xml" attachpoint="head"/>
<prop actor="props/units/shields/rome_parma_e.xml" attachpoint="shield"/>
<prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
@@ -22,7 +20,5 @@
<texture>skeletal/rome_csp_e.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -19,16 +17,22 @@
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="units/romans/hero_marcellus_r.xml" attachpoint="rider"/>
<prop actor="props/units/hero_star.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="horse-texture">
<texture>skeletal/horse_rome_marcellus.dds</texture>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Death">
<props>
<prop attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -17,6 +17,7 @@
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="units/romans/hero_maximus_r.xml" attachpoint="rider"/>
<prop actor="props/units/hero_star.xml" attachpoint="root"/>
</props>
</variant>
</group>
@@ -25,5 +26,13 @@
<texture>skeletal/horse_rome_marcellus.dds</texture>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Death">
<props>
<prop attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
@@ -15,21 +13,22 @@
<animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
<animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
<animation file="quadraped/horse_death.psa" name="death" speed="230"/>
<animation file=""/>
</animations>
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="units/romans/hero_scipio_r.xml" attachpoint="rider"/>
<prop actor="props/units/hero_star.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="horse-texture">
<texture>skeletal/horse_rome_marcellus.dds</texture>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Death">
<props>
<prop attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>

Some files were not shown because too many files have changed in this diff Show More