1
0
forked from 0ad/0ad
Commit Graph

1202 Commits

Author SHA1 Message Date
9562dc5abe This was SVN commit r7917. 2010-08-12 04:17:04 +00:00
2c23b6c3bb Added golden fleece actor placeholder
Change golden fleece resource value from 3000 to 1000
Changed large tree resources from 500 back to 300

This was SVN commit r7916.
2010-08-12 03:33:30 +00:00
d67b7cdc41 This was SVN commit r7915. 2010-08-12 03:16:15 +00:00
053bc539fc This was SVN commit r7913. 2010-08-12 03:00:41 +00:00
05204d481e This was SVN commit r7911. 2010-08-12 02:45:20 +00:00
75494ef13c Fix fence obstruction
This was SVN commit r7907.
2010-08-11 13:15:15 +00:00
0dc50ea1cd Fix GUI errors on broken entities with no icons. Delete some bogus icon sheet references.
This was SVN commit r7905.
2010-08-11 10:54:08 +00:00
b2c06651d9 Auto-gather from resources owned by the current unit's owner, not just Gaia. Expand the search range.
This was SVN commit r7904.
2010-08-11 10:53:53 +00:00
0e022109c5 Disable broken cavalry movement sounds
This was SVN commit r7899.
2010-08-11 01:20:42 +00:00
e6c3f1c482 # Use more sound effects
This was SVN commit r7891.
2010-08-10 01:25:24 +00:00
9220424275 This was SVN commit r7889. 2010-08-10 00:09:55 +00:00
e64d115d7c # Change selection circles to match the player colour
This was SVN commit r7880.
2010-08-08 17:28:51 +00:00
dbc178e4dd Expand some selection circles
This was SVN commit r7879.
2010-08-08 17:17:11 +00:00
0adb57ef98 #Fixed healer duplicate in Greek temple UI queue.
This was SVN commit r7865.
2010-08-07 20:14:21 +00:00
ea8e5a7598 Make animals spend more time eating, to save pathfinding costs
This was SVN commit r7862.
2010-08-06 22:13:57 +00:00
9d18f59940 Fix tests
This was SVN commit r7858.
2010-08-06 12:34:42 +00:00
4f2d9ee128 Fixed bandboxed entity preference code from relying on parsing template names
New rules for preferences:
 units
 defensive
 others

This was SVN commit r7857.
2010-08-06 00:29:58 +00:00
07615310f2 # Add rally points for newly-trained units, based on patch from evans.
Fixes #521.

This was SVN commit r7849.
2010-08-05 10:20:47 +00:00
82b6449f8b This was SVN commit r7847. 2010-08-05 06:47:14 +00:00
b0141436a5 This was SVN commit r7846. 2010-08-05 05:40:47 +00:00
65bcedb9fc Load map descriptions from their XML file.
Add basic hold-fire stance, and use it for some test maps.
Add JSON data container to map XML files, to simplify the interaction
between scripts and maps.
Fix fixed-point printing so it roundtrips safely through map files.
Fix camera startup positions in old-format maps.

This was SVN commit r7844.
2010-08-04 21:15:41 +00:00
41ad5bd965 # Add corpse decay and building collapse.
Make 'delete' command kill the unit instead of destroying it.
Make projectiles vanish after a timeout.
Fix projectile landing positions with low framerates.

This was SVN commit r7837.
2010-08-01 17:38:01 +00:00
aa2d305b6e Added working delete button
This was SVN commit r7832.
2010-08-01 05:09:30 +00:00
cad0baed3c Adjusted gather speeds
Rocks have more resources (500 -> 1000)

This was SVN commit r7830.
2010-08-01 00:06:40 +00:00
be59106400 Cleaned up code (slight redesign)
Added more wood to trees
 Standard trees 100 -> 300
 Special trees 300 -> 500

This was SVN commit r7829.
2010-07-31 21:46:25 +00:00
4883ddabc3 # Automatically gather from new resource after exhausting current one.
Fix error when gather target dies before the order is processed.

This was SVN commit r7827.
2010-07-31 21:21:42 +00:00
0cd0a1f584 # Add auto-attacking of nearby enemies.
Add general range-detection code.
Avoid unnecessarily computing 3D entity positions.

This was SVN commit r7817.
2010-07-29 20:39:23 +00:00
913404e4b2 Multiply vision ranges by 4 (convert from tiles to metres)
This was SVN commit r7816.
2010-07-29 20:26:26 +00:00
e416fe18cd Code cleanup and explicit number conversion
This was SVN commit r7802.
2010-07-24 22:09:59 +00:00
bc704b288a Made Animal AI default to "PASSIVE" if its type was not found
Added rudimentary fishing for units and merchant ships
Adjusted resource gather rates
Improved Mountain Pass map

This was SVN commit r7799.
2010-07-24 20:26:25 +00:00
f8275d2ed7 Added "PASSIVE" state to the Animal AI
This was SVN commit r7790.
2010-07-23 15:25:28 +00:00
ef0a80623c Fixed the resource type (wood -> wood.tree)
This was SVN commit r7780.
2010-07-21 20:41:35 +00:00
6af3f28ad4 Converted resources:
wood -> wood.tree
 stone -> stone.rock
 metal -> metal.ore
Added resource: metal.treasure
Renamed cursors and added placeholder treasure cursor
Fixed basic templates and Hellene actors to work with new resources
(need to fix Celt actors)
Fixed some warnings in the session scripts.
Added entity "Golden Fleece" placeholder

This was SVN commit r7778.
2010-07-21 18:51:27 +00:00
4e5c5e2d8f # Rewrite unit AI code.
Use HFSM for unit AI.
Support queuing orders.
Automatically attack back when attacked.
Automatically gather from farms after building them.

This was SVN commit r7775.
2010-07-21 16:09:58 +00:00
8a1aa101c1 Slow down animals, so they don't pathfind quite so much.
Make farms a better size.

This was SVN commit r7774.
2010-07-21 16:05:48 +00:00
bd2fd6c713 Extend animal AI to all animals.
This was SVN commit r7771.
2010-07-20 08:45:09 +00:00
d9d2c33ec7 Fix tests
This was SVN commit r7765.
2010-07-18 16:06:52 +00:00
e19146cf25 # Added AI for chickens.
Add scripted HFSM system.
Add very basic animal AI.
Support script-only message types.
Add shift+D hotkey to toggle dev command panel.

This was SVN commit r7763.
2010-07-18 15:19:49 +00:00
5f366d798f Added female citizens to civil center
Removed unneeded reference to portrait sheet for the Celts and Hellenes
advanced and elite units since they already inherit it

This was SVN commit r7762.
2010-07-16 14:22:18 +00:00
ae823038bd Added <IconSheet></IconSheet> attribute to entities
Added icon_sheet attribute to GUI interface
Made session GUI reference template.icon_sheet

This was SVN commit r7761.
2010-07-16 02:45:22 +00:00
d304807ac4 Authentic Greek unit names.
This was SVN commit r7752.
2010-07-14 07:57:58 +00:00
0ed5cf0355 This was SVN commit r7751. 2010-07-14 07:44:42 +00:00
778af99416 Fix NaNs when gathering from unsupported resource types.
Fall back to walking to the target when unable to perform the specified
command on it.

This was SVN commit r7723.
2010-07-08 20:08:08 +00:00
dc5a78af30 Fix simulation test
This was SVN commit r7707.
2010-07-06 20:30:22 +00:00
dff694f0f0 Fix units spawning on top of each other.
Add type-safety to prevent that kind of bug happening again.

This was SVN commit r7691.
2010-07-04 17:19:38 +00:00
22d7f871ed Entities that have 0 resources remaining are now removed
This was SVN commit r7684.
2010-07-04 02:36:30 +00:00
d98b0c21b4 Fix references to nonexistent celt_fortress
This was SVN commit r7678.
2010-07-03 15:51:32 +00:00
e23d4d232a Added rank icon
Removed displayed rank name (functions still available)
Fixed error with color name

This was SVN commit r7675.
2010-07-03 15:06:31 +00:00
5bc3c4b751 Fix inheritance of construction/training lists.
This was SVN commit r7667.
2010-07-03 01:23:23 +00:00
0d58a10604 Changed player 1 to "hele" to match units on Latium map
This was SVN commit r7663.
2010-07-02 03:10:14 +00:00
0002a5befe Extended access to existing player attributes
(this goes with previous commit - forgot to include it)

This was SVN commit r7661.
2010-07-02 02:46:32 +00:00
913c1b1946 Added getter methods for some existing attributes
This was SVN commit r7660.
2010-07-02 02:44:25 +00:00
5fec6c40dd Set svn:eol-style native
This was SVN commit r7655.
2010-07-01 16:58:44 +00:00
1c0536bf08 # Refactored the networking code, and redesigned the game setup screen.
Major updates to most network classes.
Simplify CNetServer so it doesn't duplicate any client behaviour; all
players now run CNetClient.
Remove most player/slot management from networking code.
Wait for all players to finish loading before starting the simulation.
Remove CGameAttributes; attributes are now just a JS object.
Remove CPlayer; they are now just simulation entities.
Handle player colours via simulation system.
Add a default map for Atlas, so it always has something to load.
Move network documentation to Doxygen.
Remove lots of now-unused code.

This was SVN commit r7653.
2010-06-30 21:41:04 +00:00
23c92b7fe3 Fix actor viewer animation offsetting.
Fix attack animation drifts.

This was SVN commit r7612.
2010-06-05 22:23:28 +00:00
11a20e1bcf # Handle terrain passability and movement costs in pathfinder.
Simplify terrain code (remove Handle indirection).
Delete unused terrain properties.

This was SVN commit r7590.
2010-05-27 23:31:03 +00:00
5c3a59234c Fix OOS errors when placing buildings.
Allow script components to supply custom serialization objects.

This was SVN commit r7571.
2010-05-22 23:02:07 +00:00
cdcee291cf Convert all remaining entity template data to new file format.
Add dummy component implementations for new data.
Partly support multiple weapons for a single unit.

This was SVN commit r7547.
2010-05-15 21:07:52 +00:00
afe29fdadf Fix errors and inconsistencies in entity template XML files
This was SVN commit r7532.
2010-05-09 21:46:41 +00:00
037770a2a3 Fix use of 'undefined' sound group on death.
Warn about implicit script/native type conversions.

This was SVN commit r7527.
2010-05-09 13:56:06 +00:00
1b51cf7ad5 Fix obstruction shapes for some buildings
This was SVN commit r7487.
2010-05-01 09:44:28 +00:00
cfae58928f # New unit movement system, which does a far better job of approaching targets and avoiding obstacles.
Add short-range vertex-based pathfinder.
Integrate new pathfinder into unit motion code.
Change obstruction system to get rid of circles, and differentiate
structures from units.
Make PositionChanged messages synchronous.
Try to prevent some accidental float->int conversions.

This was SVN commit r7484.
2010-04-29 23:36:05 +00:00
08720c9a58 Convert minimap data in entity templates
This was SVN commit r7481.
2010-04-23 18:37:37 +00:00
f4ad5906c9 # Display units on the minimap
This was SVN commit r7480.
2010-04-23 18:36:48 +00:00
dd809f83e8 # Add documentation of the entity template XML file format.
Simplify the format a bit.
Use less <interleave> in the RNG so that error reports become
understandable.
Fixes #491.

This was SVN commit r7478.
2010-04-23 16:09:03 +00:00
116645ff74 Update the entity templates to a slightly cleaner format
This was SVN commit r7477.
2010-04-23 16:07:45 +00:00
08db7ebe13 # Support training units in buildings.
Includes basic batch training (see #298).

This was SVN commit r7469.
2010-04-19 19:47:23 +00:00
45368671c4 Convert training queue data in entity templates.
This was SVN commit r7468.
2010-04-19 19:45:31 +00:00
40688ec5df # Initial support for automatic validation of entity template XML.
Add RelaxNG schemas for all current components.
Add -dumpSchema command-line option to dump the combined entity schema.
Add a Perl script to validate entity templates against the schema.
See #413.

This was SVN commit r7452.
2010-04-09 19:02:39 +00:00
336817a849 Update entity template conversion to be more correct and consistent
This was SVN commit r7451.
2010-04-09 18:48:11 +00:00
4c0d47707b # Fix animation syncing.
Make animations trigger sound effects.
Adjust attack animation timings to match simulation.
Simplify the animation speed settings.

This was SVN commit r7438.
2010-04-05 23:09:34 +00:00
cfca28cab0 # Initial audio integration with new simulation system.
Support sound group playback from simulation scripts. See #486.
Update some sound group files to sound better for rough testing.
Clean up CSoundGroup a tiny bit.

This was SVN commit r7437.
2010-04-04 21:24:39 +00:00
7275071785 Convert sound data in entity templates
This was SVN commit r7436.
2010-04-04 21:12:21 +00:00
7a14a3ee90 Sync new entity definitions with old
This was SVN commit r7435.
2010-04-04 20:53:43 +00:00
bddb73af13 # Make pop bonuses increase the pop limit, not decrease
This was SVN commit r7434.
2010-04-04 20:52:21 +00:00
a5b8ec6028 Add obstruction debug mode, with GUI toggle.
Make pathfinder debug mode off by default, with GUI toggle.

This was SVN commit r7377.
2010-03-20 19:18:01 +00:00
08487ce246 # Improve support for building placement (rotation, collision detection) in new simulation system
This was SVN commit r7362.
2010-03-17 23:16:04 +00:00
aca1074188 Load build speeds and foundation actors from entity template files
This was SVN commit r7353.
2010-03-12 22:28:51 +00:00
9213ee8c27 # Construct buildings from foundations.
Display construction costs in tooltips.
Stop buildings leaving corpses.
Add debug info option to GUI.

This was SVN commit r7352.
2010-03-12 21:41:40 +00:00
06928f7694 # Basic bandbox selection of units in new simulation system
This was SVN commit r7349.
2010-03-11 20:01:16 +00:00
86205b4d8e # Basic projectile attacks in new simulation system
This was SVN commit r7347.
2010-03-07 21:38:39 +00:00
36e90e71f2 Convert ranged attack data in entity templates
This was SVN commit r7346.
2010-03-07 20:22:15 +00:00
1712b2cdb1 # Support death in new simulation system
This was SVN commit r7344.
2010-03-07 20:14:30 +00:00
c8c10a4871 # Extensions and cleanups to session GUI files.
Add various GUI pieces (exit button, resource counts, unit details).
Clean up implementation of button panels.
Split some content out of 'common' and into page-specific files.
Delete some obsolete content.

This was SVN commit r7337.
2010-02-28 21:45:09 +00:00
96bb3afaaf Support disabling of inherited components in entity templates
Allow units to walk through farms

This was SVN commit r7323.
2010-02-12 22:48:16 +00:00
f8aca33a14 # Support resource gathering in new simulation system
This was SVN commit r7322.
2010-02-12 22:46:53 +00:00
321cc8ae8f Convert resource data in entity templates
This was SVN commit r7321.
2010-02-12 22:46:07 +00:00
60a9e63c71 # Improved unit animation in new simulation system
Tried to make the motion/AI/animation state transitions saner
Added smoothed rotation of moving units
Slightly more informative error reporting

This was SVN commit r7319.
2010-02-10 19:28:46 +00:00
d609a9f81c # Basic animation support in new simulation system.
Movement speed.
Improved accuracy of walking.

This was SVN commit r7313.
2010-02-07 20:06:16 +00:00
ea4c22fc0e Convert walking speed data in entity templates
This was SVN commit r7312.
2010-02-07 19:54:58 +00:00
b25076ed4d Min/max range support in pathfinder
This was SVN commit r7311.
2010-02-06 20:58:48 +00:00
b21e798243 # Primitive melee combat support in new simulation system
This was SVN commit r7309.
2010-02-05 22:00:39 +00:00
c50fe9b8c0 Convert health, armour, attack data in entity templates
This was SVN commit r7308.
2010-02-05 21:45:31 +00:00
a0ae9062d3 Convert footprint data in entity templates
This was SVN commit r7292.
2010-01-29 21:07:15 +00:00
3c2e80c698 Disable the default slide-down-hills behaviour
This was SVN commit r7290.
2010-01-27 19:34:58 +00:00
c399dc277e # Rough first version of GUI redesign
Minor GUI engine cleanups

This was SVN commit r7289.
2010-01-27 19:20:34 +00:00
f011f0a3ce Expose entity template data to GUI
This was SVN commit r7287.
2010-01-25 23:43:58 +00:00
3f1dfce41b Simplify GUI/simulation interface
This was SVN commit r7286.
2010-01-25 22:31:43 +00:00
953fb41c82 # Basic in-game building placement with new simulation system
This was SVN commit r7285.
2010-01-24 17:24:35 +00:00
0d9c9d646b Updated entity template conversion script, to convert population costs and names and civs
This was SVN commit r7284.
2010-01-24 17:20:23 +00:00
4fed9b8242 # Added initial support for players and population counters in new simulation system, plus various infrastructure improvements.
Merge from 22b478ffed8d.
Pure scripted interface definitions.
Entity creation from scripts.
Improved messaging system.
Messages on entity deletion.
Basic player entities.
Player ownership.
Bug fixes.

This was SVN commit r7281.
2010-01-22 20:03:14 +00:00
7c2e9027c2 # Rewrite of the game's simulation system
Giant merge from
http://svn.wildfiregames.com/hg-source/file/5fb522019d5e
Infrastructure is largely complete, gameplay is largely missing
Disabled by default; use command-line flag "-sim2"
(Second attempt at commit...)

This was SVN commit r7259.
2010-01-09 19:20:14 +00:00