f20a6dcfc8
Fixed bug where players would not initialize resource counts properly from scenario
...
This was SVN commit r8652.
2010-11-19 05:05:45 +00:00
f1f1a44031
Made changes to BuildingAI based on Philip's comments
...
This was SVN commit r8639.
2010-11-17 18:25:00 +00:00
222095fa44
Added Building AI, and some small changes to GarrisonHolder
...
This was SVN commit r8636.
2010-11-17 07:30:25 +00:00
9c521ceb3b
Add minimum range to range queries
...
This was SVN commit r8627.
2010-11-16 20:43:15 +00:00
c1c8f64f0d
Move statistics from GuiInterface.GetSimulationState to GuiInterface.GetExtendedSimulationState
...
This was SVN commit r8603.
2010-11-14 19:09:13 +00:00
8798b7671c
Use separate mode when carrying meat.
...
Fix tests.
This was SVN commit r8594.
2010-11-13 21:39:39 +00:00
4100a13e0a
# Add resource shuttling.
...
Add resource-carrying animations/props to an actor for testing.
Warn more quietly about invalid cursor names.
This was SVN commit r8589.
2010-11-13 19:15:29 +00:00
2b70b43086
Based selection groups off of a new tag which must contain a valid template name.
...
<SelectionGroupName>unit_template_name_b</SelectionGroupName>
This was SVN commit r8587.
2010-11-13 05:35:40 +00:00
3cefbbe253
Modified UnitAI to respect diplomatic status of players, allies can no longer be attacked, and fixed some related bugs in player init
...
This was SVN commit r8583.
2010-11-13 02:36:53 +00:00
245f29b798
Summary screen. Closes #638 .
...
This was SVN commit r8576.
2010-11-12 22:24:49 +00:00
ff3c7b46f4
Added food.treasure, wood.treasure, stone.treasure, wood.ruins, stone.ruins
...
Added placeholder cursor for ruins
Added entities for testing these types
This was SVN commit r8574.
2010-11-12 18:58:33 +00:00
dde2cd38be
Show Population Cost in unit training buttons
...
Show Population Bonus in unit construction buttons
This was SVN commit r8559.
2010-11-08 23:23:52 +00:00
5d764f1435
Run network server in a separate thread, to minimise latency.
...
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.
This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
62c90b5dc4
Fix tests
...
This was SVN commit r8504.
2010-10-31 00:29:29 +00:00
1840bb3507
Stop units walking outside the edges of circular maps.
...
Switch the GUI between square/circular minimap automatically.
This was SVN commit r8500.
2010-10-30 18:25:34 +00:00
9ee44bd9b8
Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590 .
...
This was SVN commit r8494.
2010-10-30 04:02:42 +00:00
2b2cac2a8d
Fix tests
...
This was SVN commit r8456.
2010-10-24 12:37:55 +00:00
3521c8f51e
Made garrisoning based on the quantity of units, not the population cost of those units.
...
This was SVN commit r8453.
2010-10-24 01:14:34 +00:00
0aaddf62aa
Garrisoning for buildings based on patch by Evans ( fixes #610 )
...
This was SVN commit r8451.
2010-10-23 22:43:15 +00:00
24fb9cd313
Split unit icon sheets into individual textures, for easier editing
...
This was SVN commit r8440.
2010-10-22 23:27:42 +00:00
937769035a
Only show formation icons for units
...
This was SVN commit r8407.
2010-10-17 20:01:18 +00:00
5ca46883e6
Limit training queue size
...
(Fixes #613 )
This was SVN commit r8382.
2010-10-16 21:53:50 +00:00
ee8d49200a
Fix formation movement loop when switching from column
...
This was SVN commit r8369.
2010-10-15 19:25:17 +00:00
3cedddf60d
Disable rank icons
...
This was SVN commit r8354.
2010-10-14 16:25:00 +00:00
c1967848d2
# Fix units killing their own farms
...
This was SVN commit r8343.
2010-10-13 15:14:15 +00:00
3f7941d5c2
Hide the health bar when a unit containing resources is killed
...
This was SVN commit r8307.
2010-10-07 22:41:48 +00:00
7ebf258033
Fix tests
...
This was SVN commit r8299.
2010-10-07 10:35:45 +00:00
368b07b04e
# Add hunting (animals get killed before gathering meat from them)
...
This was SVN commit r8296.
2010-10-06 21:37:55 +00:00
9872cb17b8
Deselect units that disappear into fog-of-war.
...
Fixes #596 .
This was SVN commit r8278.
2010-10-05 00:08:05 +00:00
f662e069b1
Tighten schema for ranks, to help detect errors
...
This was SVN commit r8277.
2010-10-05 00:07:15 +00:00
19066998c1
Show rank icon on selected units
...
This was SVN commit r8276.
2010-10-05 00:05:52 +00:00
ab77ec40e4
Fix highlighting of obstructed building placement previews.
...
Prevent building in non-visible areas.
Fixes #594 .
This was SVN commit r8272.
2010-10-04 17:34:33 +00:00
cc0a680a21
Increase box/column formation switching distance
...
This was SVN commit r8257.
2010-10-03 23:20:21 +00:00
2cc6280d70
Fix OOS
...
This was SVN commit r8255.
2010-10-03 20:12:08 +00:00
59c8ecfa3d
Use voices for infantry/cavalry units.
...
Make arrows quieter.
Handle order-related sounds via the GUI instead of simulation, to make
them player-specific and to reduce latency.
This was SVN commit r8254.
2010-10-03 17:58:49 +00:00
9a0db9713e
Add resource supply status bars.
...
Change bar size for buildings.
Only highlight one entity on mouse hover, and only if it's not a unit.
Display status bars on foundations.
This was SVN commit r8249.
2010-10-03 00:30:43 +00:00
7412e5563a
Switch to column formation when moving longer distances.
...
Increase minimum box formation width to 5.
This was SVN commit r8243.
2010-10-02 19:40:30 +00:00
7ea522a484
# Add on-screen health bars
...
This was SVN commit r8241.
2010-10-02 12:41:29 +00:00
fcedcae052
# Add victory/defeat conditions, based on patch from fcxSanya.
...
Fixes #565 .
This was SVN commit r8234.
2010-10-01 20:51:21 +00:00
924d1219a7
# Add fog-of-war.
...
Move Vision component to C++, for more efficient FoW processing.
Disable FoW on demo maps.
This was SVN commit r8160.
2010-09-23 12:13:13 +00:00
a901a2a207
Fix #566 (test failure)
...
This was SVN commit r8088.
2010-09-07 09:29:23 +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
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
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
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
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
7a2fac889f
Enabled template tooltips
...
This was SVN commit r7988.
2010-08-17 00:55:02 +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
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
e6c3f1c482
# Use more sound effects
...
This was SVN commit r7891.
2010-08-10 01:25:24 +00:00
e64d115d7c
# Change selection circles to match the player colour
...
This was SVN commit r7880.
2010-08-08 17:28:51 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f8aca33a14
# Support resource gathering in new simulation system
...
This was SVN commit r7322.
2010-02-12 22:46:53 +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
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
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
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
