Commit Graph

266 Commits

Author SHA1 Message Date
5db5aa6ad9 #New giraffe fauna.
This was SVN commit r8147.
2010-09-20 16:24:26 +00:00
76c5874a8c New Savanna "metal mine" slab entities and textures.
This was SVN commit r8145.
2010-09-20 04:12:47 +00:00
6465bd66ff Fixed a couple of things.
This was SVN commit r8135.
2010-09-18 19:35:27 +00:00
19eec7fde2 Made a new "grape vine" object and added it to Arcadia II.xml
This was SVN commit r8134.
2010-09-18 19:25:47 +00:00
594cad069f #Arcadia II is done (might tweak it later). Tweaked the FISH entity. Re-ordered the buildings for the Female Citizen.
This was SVN commit r8112.
2010-09-13 19:36:07 +00:00
88307763f6 New "Stoa" object.
This was SVN commit r8110.
2010-09-13 05:04:02 +00:00
19ba2927d8 adjusted the Greek wall entity and adjusted my working copy of Arcadia II.
This was SVN commit r8106.
2010-09-11 18:01:09 +00:00
933fb2dc9f new Greek Wall
This was SVN commit r8090.
2010-09-08 22:57:46 +00:00
a901a2a207 Fix #566 (test failure)
This was SVN commit r8088.
2010-09-07 09:29:23 +00:00
db47fa94b4 #New Greek Wall Tower by Brightgalrs. Continued work on a new map.
This was SVN commit r8087.
2010-09-07 01:56:05 +00:00
fb9ed7d1f9 Removed 50+ pop bonus. Modified the Gold Rush map. Added new Greek map, but it is a work in progress.
This was SVN commit r8086.
2010-09-06 18:34:25 +00:00
c6159c98dd This was SVN commit r8083. 2010-09-06 00:09:33 +00:00
b1e32f9542 Fix tests
This was SVN commit r8077.
2010-09-04 21:29:27 +00:00
fae4a3da24 Fix #548 (GUI should give feedback when training queue entry is blocked), based on patch from fcxSanya
This was SVN commit r8071.
2010-09-04 13:24:52 +00:00
6ceee8a5ec This was SVN commit r8069. 2010-09-04 04:11:15 +00:00
086d522050 Made structures reference new buildings icon sheet
This was SVN commit r8068.
2010-09-04 01:41:10 +00:00
e88760f7c1 Made comment consistent with changes
This was SVN commit r8064.
2010-09-03 20:18:54 +00:00
5cc04d44f8 Fix some script errors
This was SVN commit r8062.
2010-09-03 20:04:11 +00:00
7f680afd0a Fixed unhandled event 'ResourceGather' in the PASSIVE state
This was SVN commit r8061.
2010-09-03 19:58:15 +00:00
2b57f4f998 # Initial support for formation movement.
Support asynchronous path queries.
Allow escaping when stuck in impassable terrain tiles.
Split Update message in multiple phases, to cope with ordering
requirements.
Support automatic walk/run animation switching.

This was SVN commit r8058.
2010-09-03 09:55:14 +00:00
f80ee08f5f This was SVN commit r8054. 2010-09-02 19:21:49 +00:00
38f29e055c #New Greek Scout Tower and textures.
This was SVN commit r8053.
2010-09-01 21:32:05 +00:00
1cbd528b94 This was SVN commit r8050. 2010-08-30 01:45:54 +00:00
f5b32e0ff5 This was SVN commit r8049. 2010-08-30 01:03:54 +00:00
660ce1bcb8 This was SVN commit r8042. 2010-08-29 04:25:13 +00:00
5141a0d3bb This was SVN commit r8040. 2010-08-29 01:12:23 +00:00
b0ea2c62be This was SVN commit r8036. 2010-08-28 05:32:36 +00:00
f1c0370e9e This was SVN commit r8035. 2010-08-26 21:57:52 +00:00
3f5661a90e Adjusted build times for buildings.
This was SVN commit r8034.
2010-08-26 02:51:02 +00:00
e2b55d56a6 Tweaked the tooltips again.
This was SVN commit r8032.
2010-08-26 01:14:14 +00:00
2c5c4bc292 Re-worded the tooltips a little bit.
This was SVN commit r8031.
2010-08-24 02:34:04 +00:00
c78dffb19f Fix tests
This was SVN commit r8029.
2010-08-23 17:36:28 +00:00
a41dd1d736 # Add repair command.
Fix #537 (Repair functionality for damaged buildings) based on patch
from evans.
Make some unnecessarily optional template elements required.

This was SVN commit r8015.
2010-08-21 21:53:51 +00:00
b38e032c7e # Population limits.
Fix #531 (Enforce Population Limit), based on patch from evans.
Empty training queue and refund resources when buildings are destroyed
or captured.
Specify Cost defaults in XML instead of JS, to simplify some code.

This was SVN commit r8014.
2010-08-21 20:43:55 +00:00
445a300a3a Rebalanced the gather speeds for Advanced and Elite unit levels. Players will need to research econ techs in order to speed up gathering.
This was SVN commit r8012.
2010-08-21 00:55:00 +00:00
9a316f21e0 This was SVN commit r8009. 2010-08-20 00:27:38 +00:00
09a64be42f This was SVN commit r8001. 2010-08-18 02:56:24 +00:00
65358cb9fe This was SVN commit r7997. 2010-08-18 02:15:59 +00:00
5ee7f7b178 Reworked selection details and rank code
Added rank tag to templates to avoid string parsing

This was SVN commit r7995.
2010-08-17 13:37:46 +00:00
e3b6d47b95 This was SVN commit r7994. 2010-08-17 05:43:26 +00:00
0405ebd7a6 Added a cheeky tooltip to the pyramids.
This was SVN commit r7993.
2010-08-17 02:43:17 +00:00
7dd4bdb2ed This was SVN commit r7992. 2010-08-17 02:26:37 +00:00
723653fdbc This was SVN commit r7991. 2010-08-17 02:24:47 +00:00
e44c87543f This was SVN commit r7990. 2010-08-17 01:18:15 +00:00
d9aa52af8e Edited tooltips.
This was SVN commit r7989.
2010-08-17 01:13:29 +00:00
7a2fac889f Enabled template tooltips
This was SVN commit r7988.
2010-08-17 00:55:02 +00:00
ee642bd030 Animal icons by Mario Machado
This was SVN commit r7984.
2010-08-16 15:58:40 +00:00
fc68300f58 This was SVN commit r7980. 2010-08-16 00:50:45 +00:00
7525aecc17 #Gather food from Apple Trees.
This was SVN commit r7976.
2010-08-15 22:04:19 +00:00
5323ba6299 This was SVN commit r7973. 2010-08-15 19:11:39 +00:00
85774db1c4 #Egyptian Cliff textures.
This was SVN commit r7972.
2010-08-15 17:14:40 +00:00
cabd993966 Switch default multiplayer map.
Change infantry-train sound to something a bit more appropriate.

This was SVN commit r7967.
2010-08-15 12:22:19 +00:00
da32e232ba Added some of Amish's icons to the icon sheets.
This was SVN commit r7965.
2010-08-15 05:17:47 +00:00
2af573edbc This was SVN commit r7960. 2010-08-15 04:16:09 +00:00
6117fbeff7 This was SVN commit r7959. 2010-08-15 04:13:30 +00:00
7a99bab861 Tweaked armor and other stats based upon 2 weeks of play testing.
This was SVN commit r7957.
2010-08-15 04:00:46 +00:00
4e1b6d08f4 Fix lithobolos size and projectile.
Fix projectiles launching from actors with no ammo prop.
Fix default camera location on maps with no civ centers.
Avoid units getting stuck on the edges of buildings.

This was SVN commit r7950.
2010-08-14 22:11:32 +00:00
8967395da6 Made chat messages send a GUID rather than a user name
This was SVN commit r7943.
2010-08-14 15:34:36 +00:00
50bccd8720 Made notifications visible only to the relevant player
This was SVN commit r7942.
2010-08-14 04:34:49 +00:00
5a42689d5e Fix typo
This was SVN commit r7940.
2010-08-13 22:06:19 +00:00
9a1e450031 Added a basic notification system
Currently, it only reports insufficient resource notifications

This was SVN commit r7939.
2010-08-13 22:02:27 +00:00
a2b2acb522 Remove training speedup hack. Add time discount for batches.
This was SVN commit r7928.
2010-08-13 13:14:59 +00:00
2e4be5f781 Made the Hetairoi a little stronger in charge (they are actually beaten by Elite Hypikkoi in basic combat, lol). I also toned down the Cavalry meat gathering bonus.
This was SVN commit r7927.
2010-08-12 23:53:36 +00:00
3eb9249a6b Re-enable cavalry movement sounds
This was SVN commit r7920.
2010-08-12 11:00:18 +00:00
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