Commit Graph

3242 Commits

Author SHA1 Message Date
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
b9e288301b This was SVN commit r8067. 2010-09-04 01:01:17 +00:00
e89c761cce This was SVN commit r8066. 2010-09-04 00:44:04 +00:00
ef752ebd53 This was SVN commit r8065. 2010-09-03 22:04:16 +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
bf4ea39457 This was SVN commit r8052. 2010-08-31 01:55:14 +00:00
90e4672c8d Removed unnecessary null assignment
This was SVN commit r8051.
2010-08-30 14:43:26 +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
4e3186c8a2 This was SVN commit r8048. 2010-08-30 00:49:14 +00:00
ae4e03f1e5 Fix config typo
This was SVN commit r8047.
2010-08-29 20:04:39 +00:00
660ce1bcb8 This was SVN commit r8042. 2010-08-29 04:25:13 +00:00
714573c442 Deleting Latium map and will replace with a new one soon.
This was SVN commit r8041.
2010-08-29 01:41:58 +00:00
5141a0d3bb This was SVN commit r8040. 2010-08-29 01:12:23 +00:00
ed0c6c72c8 added auto-smooth group
This was SVN commit r8039.
2010-08-28 23:50:07 +00:00
0273df2943 #New texture for Greek military and economic buildings.
This was SVN commit r8038.
2010-08-28 22:15:40 +00:00
0a98fbaba2 Cache the Entity States and Templates to increase performance
This was SVN commit r8037.
2010-08-28 21:12:52 +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
f574d32339 #Low-detail 'Gold Rush' map for players who have uncomfortable lag playing other more detailed maps.
This was SVN commit r8033.
2010-08-26 02:21:59 +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
b9b5f1461a This was SVN commit r8027. 2010-08-22 19:20:37 +00:00
0e2dd1671c This was SVN commit r8025. 2010-08-22 18:03:21 +00:00
a9b11b780e Fix right clicks passing through GUI objects and triggering unit commands.
Fix cursor displaying unit commands when over a GUI object.

This was SVN commit r8020.
2010-08-21 23:58:08 +00:00
2529ae2a7b Fix #543 (Replace skybox with black background), based on patch from Jayschwa
This was SVN commit r8018.
2010-08-21 22:43:35 +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
92dfdd64cb #Larger icon sheet for Buildings.
This was SVN commit r8011.
2010-08-20 04:40:09 +00:00
aec91893cd This was SVN commit r8010. 2010-08-20 00:51:28 +00:00
9a316f21e0 This was SVN commit r8009. 2010-08-20 00:27:38 +00:00
4bb65aaf45 This was SVN commit r8008. 2010-08-19 23:33:45 +00:00
aa65eb2008 Fixed empty tooltips from displaying a small, empty square
This was SVN commit r8004.
2010-08-19 14:57:51 +00:00
dfa155f6b9 Simplified the main selected unit's icon tooltip
This was SVN commit r8003.
2010-08-19 14:09:00 +00:00
5a745eb1c7 This was SVN commit r8002. 2010-08-19 03:55:45 +00:00
09a64be42f This was SVN commit r8001. 2010-08-18 02:56:24 +00:00
ad841c3e02 This was SVN commit r8000. 2010-08-18 02:47:38 +00:00
20b2e744ae This was SVN commit r7999. 2010-08-18 02:22:33 +00:00
be6fe81ad1 This was SVN commit r7998. 2010-08-18 02:19:26 +00:00
65358cb9fe This was SVN commit r7997. 2010-08-18 02:15:59 +00:00
fe9d2d291e This was SVN commit r7996. 2010-08-18 01:27:03 +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
f64e4c71cf This was SVN commit r7987. 2010-08-17 00:13:18 +00:00
03cdd1aa9a This was SVN commit r7986. 2010-08-17 00:13:03 +00:00
ae4ce3b097 This was SVN commit r7985. 2010-08-17 00:12:39 +00:00
ee642bd030 Animal icons by Mario Machado
This was SVN commit r7984.
2010-08-16 15:58:40 +00:00
d401e8a401 This was SVN commit r7982. 2010-08-16 01:28:31 +00:00
c7bcca97cf This was SVN commit r7981. 2010-08-16 01:23:17 +00:00
fc68300f58 This was SVN commit r7980. 2010-08-16 00:50:45 +00:00
2c65a3d5dd #New Egyptian Obelisk eye candy by Brightgalrs.
This was SVN commit r7979.
2010-08-15 23:24:04 +00:00
1fc3b198ba This was SVN commit r7978. 2010-08-15 23:22:09 +00:00
0258d6614f This was SVN commit r7977. 2010-08-15 22:15:19 +00:00
7525aecc17 #Gather food from Apple Trees.
This was SVN commit r7976.
2010-08-15 22:04:19 +00:00
57584e80ec This was SVN commit r7975. 2010-08-15 21:05:06 +00:00
cd76d5c4b7 Gazelle horns.
This was SVN commit r7974.
2010-08-15 20:27:21 +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
f8765d741e Import files used by Hellenised_Egypt
This was SVN commit r7966.
2010-08-15 12:06:46 +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
ea79bd4db4 This was SVN commit r7964. 2010-08-15 05:16:40 +00:00
eb18aed95a This was SVN commit r7963. 2010-08-15 04:29:28 +00:00
7016fa7015 Cleaning house
This was SVN commit r7962.
2010-08-15 04:27:16 +00:00
03b12d81c3 This was SVN commit r7961. 2010-08-15 04:22:01 +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
5b81cc4b99 This was SVN commit r7958. 2010-08-15 04:04:25 +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
e95b953989 This was SVN commit r7956. 2010-08-15 01:55:28 +00:00
1dedae51f3 This was SVN commit r7955. 2010-08-15 01:54:41 +00:00
9c5fd64d5f Defocus the chat box when sending an empty message
This was SVN commit r7954.
2010-08-15 01:27:52 +00:00
157dbdec62 #New map for Alpha release -- "Hellenised Egypt"
This was SVN commit r7953.
2010-08-15 01:11:22 +00:00
8992569c3c This was SVN commit r7952. 2010-08-15 00:11:43 +00:00
37797d6313 This was SVN commit r7951. 2010-08-15 00:07:24 +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
a326126d4c This was SVN commit r7949. 2010-08-14 22:04:24 +00:00
b6cd287878 This was SVN commit r7948. 2010-08-14 21:54:07 +00:00
64daef95df Fix chat to use GUID instead of host ID.
Fix randomly incorrect player names.
Fix script errors when connecting to an invalid IP address.
Adjust the server/client disconnection messages to be a bit more
accurate.

This was SVN commit r7946.
2010-08-14 19:45:22 +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
c8f90ce5a2 Refined chat and added chat messages to the console
Cleaned up session menu code (cached menu objects)

This was SVN commit r7935.
2010-08-13 16:05:06 +00:00
5135bcb899 Default to fullscreen, since it's more useful for most players.
Make Alt+F4 always quit the program.

This was SVN commit r7933.
2010-08-13 14:20:05 +00:00
961d19d037 Try a more readable stroked font.
This was SVN commit r7932.
2010-08-13 14:14:27 +00:00
2deac598eb Remove focus from chat box after sending message
This was SVN commit r7931.
2010-08-13 13:50:03 +00:00
6c7b82130c # Redesigned the camera control system.
Add shift+wheel (and Q/E, and ctrl+arrows, and ctrl+WASD) to rotate the
camera.
Restrict the rotation and zoom to narrow ranges. (Constraints can be
disabled in the dev overlay).
Smooth the movement and rotation.
Fix some stupid whitespace.
Fix some const correctness.

This was SVN commit r7930.
2010-08-13 13:26:29 +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
e831cac647 Added "return to menu" button to disconnected screen
Show the name of the player that left (if not the host)

This was SVN commit r7926.
2010-08-12 23:15:01 +00:00
f0a0c69770 Removed the connection message
Removed the disconnection message's color

This was SVN commit r7925.
2010-08-12 20:15:27 +00:00
859c696afe Show when a player leaves multiplayer
This was SVN commit r7924.
2010-08-12 19:31:17 +00:00
b7d5648cc9 The clear timer line will not be needed all the time, but when a new message removes an older message (only happens when there's not enough room) it needs to disable the timer for that older message
This was SVN commit r7923.
2010-08-12 17:50:43 +00:00
3947495db9 Don't need to manually clear timers because this happens automatically when they expire
This was SVN commit r7922.
2010-08-12 17:40:30 +00:00
d41d554678 Reworked session code splitting some things out to different files
This was SVN commit r7921.
2010-08-12 15:44:03 +00:00
3eb9249a6b Re-enable cavalry movement sounds
This was SVN commit r7920.
2010-08-12 11:00:18 +00:00
19c0e60748 Restore Oasis description
This was SVN commit r7919.
2010-08-12 10:57:08 +00:00
c1077e2384 This was SVN commit r7918. 2010-08-12 04:35:08 +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
d5bd374586 This should finish up multiplayer chat (#216)
Made chat window look a little better
Fixed issue with autostart

This was SVN commit r7914.
2010-08-12 03:01:33 +00:00
053bc539fc This was SVN commit r7913. 2010-08-12 03:00:41 +00:00
d9b52e4e78 Re-committing mounted steps with XML
This was SVN commit r7912.
2010-08-12 02:50:23 +00:00
05204d481e This was SVN commit r7911. 2010-08-12 02:45:20 +00:00
4cfca1625d Added Multi-player chat in menu and hotkey (return key)
Made player names match custom names in multi-player

The chat window will still need some more aesthetic work

This was SVN commit r7909.
2010-08-11 22:16:16 +00:00
54d9224918 Add focus() script method to GUI objects.
Add basic GUI script timer.

This was SVN commit r7908.
2010-08-11 21:04:09 +00:00
75494ef13c Fix fence obstruction
This was SVN commit r7907.
2010-08-11 13:15:15 +00:00
3fd6159f00 This was SVN commit r7906. 2010-08-11 12:34:25 +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
46bf5bc6cb Switch default single-player map to Arcadia. Fix default multiplayer map.
This was SVN commit r7903.
2010-08-11 10:52:15 +00:00
8107cca475 Move fence actor to public
This was SVN commit r7902.
2010-08-11 10:51:13 +00:00
df613452c6 Arcadia map for pre-alpha release. Tweaked grass texture.
This was SVN commit r7901.
2010-08-11 02:57:33 +00:00
461100b6f8 Try rephrasing the pre-release warning text
This was SVN commit r7900.
2010-08-11 01:22:05 +00:00
0e022109c5 Disable broken cavalry movement sounds
This was SVN commit r7899.
2010-08-11 01:20:42 +00:00
d46abd9aaf Use a fixed aspect ratio for the menu screen background and loading screen concept art, to prevent ugly stretching at widescreen resolutions
This was SVN commit r7898.
2010-08-10 22:39:00 +00:00
e6c3f1c482 # Use more sound effects
This was SVN commit r7891.
2010-08-10 01:25:24 +00:00
d1bc05f399 This was SVN commit r7890. 2010-08-10 00:10:23 +00:00
9220424275 This was SVN commit r7889. 2010-08-10 00:09:55 +00:00
4030430722 #New 'Arcadia' map for the next pre-Alpha release.
This was SVN commit r7888.
2010-08-10 00:08:32 +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
02d4115d1d Remove confusing settlements under civ centers in Latium
This was SVN commit r7878.
2010-08-08 16:35:08 +00:00
6dfde9daa5 Remove techdemo1 since it's rubbish
This was SVN commit r7877.
2010-08-08 16:17:01 +00:00
e77ae6216f Remove Latium dupe
This was SVN commit r7876.
2010-08-08 16:16:12 +00:00
80f726c36b Rename maps.
This was SVN commit r7875.
2010-08-08 16:13:06 +00:00
b4456315e2 Add descriptions to maps.
This was SVN commit r7874.
2010-08-08 16:07:11 +00:00
353032070c Replace "_" with " " in displayed map names.
Hide "_default" map from display.
Default to techdemo-mp map for multiplayer games.
Fix script error when selecting "Unassigned" in single-player setup
screen.

This was SVN commit r7872.
2010-08-08 15:25:16 +00:00
814a8722da Don't load the Atlas DLL on startup, to improve performance.
This was SVN commit r7871.
2010-08-08 15:23:39 +00:00
4e58318ffc Fix "pre-alpha" reference.
This was SVN commit r7870.
2010-08-08 15:23:03 +00:00
95edc4ea4b Fix player assignments in Mountain Pass map.
This was SVN commit r7868.
2010-08-08 15:21:16 +00:00
9765202d16 Move 512x512_desert to non-public, since it has broken textures and isn't useful
This was SVN commit r7867.
2010-08-08 14:00:15 +00:00
eef74bb784 Right-clicking with buildings selected should always set the rally point, even when clicking on another unit
This was SVN commit r7866.
2010-08-07 21:27:09 +00:00
0adb57ef98 #Fixed healer duplicate in Greek temple UI queue.
This was SVN commit r7865.
2010-08-07 20:14:21 +00:00
d2e6233c44 Fixed HP display issues in GUI
This was SVN commit r7864.
2010-08-07 00:21:17 +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
40e268e06a # Add terrain smoothing tool to Atlas, based on patch from DigitalSeraphim.
Fixes #516.

This was SVN commit r7854.
2010-08-05 20:43:31 +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
c39c4ac8d3 Ignore recently-deceased units more gracefully in makePrimarySelection
This was SVN commit r7848.
2010-08-05 10:07:00 +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
a5171d9145 Just display the delete button until the other commands are implemented
This was SVN commit r7843.
2010-08-03 01:54:16 +00:00
76e6b6dbe3 Made bandboxed selections more intelligent by preferring entities in this order:
1) units and animals
2) towers
3) buildings that are the same type as the first building
4) non-building entities

This was SVN commit r7840.
2010-08-01 21:50:03 +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
67e3a95d74 Added Delete Hotkey
Misc minor changes

This was SVN commit r7835.
2010-08-01 16:25:24 +00:00
aa2d305b6e Added working delete button
This was SVN commit r7832.
2010-08-01 05:09:30 +00:00
dd2fcad2a2 Fixed fractional resources showing up in the GUI
This was SVN commit r7831.
2010-08-01 00:33:20 +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
ba591b6d9f Redesigned the selection GUI
No more groups of any kind
Max selection size increased to 32

Single click - deselects all others
Single click with shift key - deselects all that are not the same type
(only for one rank)

This was SVN commit r7826.
2010-07-30 22:19:43 +00:00
f625285386 Multiply more vision ranges by 4
This was SVN commit r7820.
2010-07-29 20:50:30 +00:00
22591ae210 Add combat test maps.
This was SVN commit r7818.
2010-07-29 20:40:04 +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
365c005394 Code cleanup
This was SVN commit r7815.
2010-07-29 18:22:58 +00:00
ff7ea96189 Code cleanup
This was SVN commit r7811.
2010-07-26 03:31:54 +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
ddb48c4631 Updated actor viewer animation names to match changes in actor files (animations for renamed resources)
This was SVN commit r7794.
2010-07-24 12:39:10 +00:00
f8275d2ed7 Added "PASSIVE" state to the Animal AI
This was SVN commit r7790.
2010-07-23 15:25:28 +00:00
2f54e77e29 Updated gather treasure cursor
(created by Mario Machado aka mfmachado)

This was SVN commit r7789.
2010-07-22 22:18:49 +00:00
f81e6a2bbd removed the fence around the walrus (very unnecessary, and quite silly, as well as not having any effect, not sure what to say about the walrus though =) ) as the fence as discovered by Brian wasn't part of the public SVN
This was SVN commit r7782.
2010-07-21 22:20:53 +00:00
9a6c020fce Allowed selections with only one group to also show the unit stats area
Split unit cycle back to 2 functions

This was SVN commit r7781.
2010-07-21 21:02:21 +00:00
ef0a80623c Fixed the resource type (wood -> wood.tree)
This was SVN commit r7780.
2010-07-21 20:41:35 +00:00
41e1652e10 Using .png for session cursors
Added .png version of cursors
Added gather treasure cursor

This was SVN commit r7779.
2010-07-21 20:35:26 +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
602c92beae GUI support for queued orders
This was SVN commit r7776.
2010-07-21 17:13:04 +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
9674c3c0fe Remove ScriptingHost initialisation code (share with ScriptInterface instead).
Fix GUI scripts to avoid strict warnings.
Rejig GUI/SpiderMonkey interface to use less custom code, and to work
with JSOPTION_VAROBJFIX.
Add event name to GUI event handler function names (visible in the
profiler).

This was SVN commit r7769.
2010-07-19 23:01:58 +00:00
544afca570 Delete some old unused GUI scripts
This was SVN commit r7767.
2010-07-19 22:55:30 +00:00
0be1713b2b Made several changes to session GUI (cosmetic).
Up/down arrow sprites are usable as regular buttons now.

Selections now group ranked units together as a single group. This
feature can be toggled in the settings window. Depending on feedback, I
will probably choose one method over the other and remove the toggle.

New map - Mountain Pass (8 player)
It will need further polishing.

This was SVN commit r7766.
2010-07-19 21:23:12 +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
1f8459f717 Added new styles
Outlined player names to make them stand out more
(Probably will need a new font to get a good effect with the player
names)

This was SVN commit r7760.
2010-07-14 21:54:11 +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
90bfa8408e This was SVN commit r7749. 2010-07-14 04:52:12 +00:00
5a2630be1d This was SVN commit r7748. 2010-07-14 04:40:37 +00:00
828efdde8f Tweaked the Hellene animation speeds
This was SVN commit r7737.
2010-07-11 20:00:14 +00:00
6b8924324a # Added one of each civ centre unit for all players to techdemo-mp.xml (Multiplayer testing map)
This was SVN commit r7736.
2010-07-11 13:14:45 +00:00
0cb1fbe4d5 Fixed gathering from enemy farms instead of player owned farms
This was SVN commit r7735.
2010-07-11 01:25:50 +00:00
c0e915fd5d # Added more resources to the techdemo-mp.pmp (multiplayer testing map) to make testing more fun (also added some underwater/shoreline texture)
This was SVN commit r7734.
2010-07-10 23:35:48 +00:00
27512039a7 Made units attack enemy foundations instead of trying to build them
This was SVN commit r7730.
2010-07-10 17:28:32 +00:00
9b88e46fce Code cleanup
This was SVN commit r7727.
2010-07-09 00:19:36 +00:00
c50f2d6d40 If any units in a selection have the ability to perform a task, then that task will be available even if some of the units cannot perform it. Units that cannot, will simply move to the target.
This was SVN commit r7726.
2010-07-08 22:47:57 +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
56e1802b81 Show message box when opening URL, since it might take a while to launch the browser
This was SVN commit r7721.
2010-07-08 18:46:39 +00:00
4b06ebd52d Add basic help page into the main menu.
Add buttons to open the web site and IRC.
Tentatively allow Atlas to be launched from the menu.
Add some shutdown functions to support relaunching into Atlas without
having to restart the whole process.

This was SVN commit r7714.
2010-07-07 21:47:31 +00:00
db8dda7bda Used Hele portrait sheet for units that begin with "camp"
Made button layout ever so slightly more efficient
Fixed some more Hellene animation speeds

This was SVN commit r7713.
2010-07-07 13:28:37 +00:00
7a58980ad6 Remove unneeded genericity
This was SVN commit r7712.
2010-07-07 10:47:20 +00:00
6bd38c1e5d Report errors when hosting/joining fails
This was SVN commit r7709.
2010-07-06 20:51:45 +00:00
5d5cb02b21 Disable visible logging of network messages
This was SVN commit r7708.
2010-07-06 20:31:05 +00:00
dc5a78af30 Fix simulation test
This was SVN commit r7707.
2010-07-06 20:30:22 +00:00
31699e830d Handle disconnections better.
Remove local sessions (just use ENet for everything instead) because
they add far too much complexity.
Fix memory leaks.

This was SVN commit r7706.
2010-07-06 19:54:17 +00:00
1bfb913a69 Fixed attempt to perform a string operation on a template instead of the template name
Worked on Hellene actor animation speeds
(They will still need some more tweaking)

This was SVN commit r7702.
2010-07-06 01:23:50 +00:00
5be1052ad0 Fixed a GUI selection display bug where the final element of a large selection was wrapping around and replacing the first selection group.
Added and removed some utility functions in session.js

This was SVN commit r7701.
2010-07-05 23:04:38 +00:00
669b230522 Re-enabled "remove from training queue" buttons since they work now
This was SVN commit r7697.
2010-07-05 16:56:30 +00:00
5d224bbeb6 Added tooltip to rank icon
Some code cleanup / rework
Minor fixes

This was SVN commit r7696.
2010-07-05 16:50:06 +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
d764473844 Fixed resource quantities not showing for player owned units
This was SVN commit r7685.
2010-07-04 03:49:58 +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
3af3cbe99a Fixed the GUI selection issue where killed units were not being removed from the selection or the selection display
This was SVN commit r7683.
2010-07-04 01:03:14 +00:00
065f0deea3 Added third row of buttons to layout
This was SVN commit r7679.
2010-07-03 16:51:20 +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
9332a20998 Add map for multiplayer testing
This was SVN commit r7674.
2010-07-03 14:55:32 +00:00
5bc3c4b751 Fix inheritance of construction/training lists.
This was SVN commit r7667.
2010-07-03 01:23:23 +00:00
be2e1b158a Made player colors work for player names
Used civ name for the player name's tooltip
Created some additional utility functions

(finishing previous commit that was interrupted due to
some files being out of date)

This was SVN commit r7665.
2010-07-02 21:42:17 +00:00
051aa70940 Basic disconnection handling.
Pre-game chat.
Fix dynamic updates of focused input controls.
Allow scrollable texts to automatically scroll to the bottom.
Force usernames to be unique.

This was SVN commit r7664.
2010-07-02 21:28:48 +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
98a7d67b43 Player name now references actual player name (almost)
Added civ name to tooltip of player name
Player colors hacked in (to at least look consistent)
Made icons reference proper portrait sheets

This was SVN commit r7662.
2010-07-02 02:50:45 +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
8f48d0f007 Moved menu code out into:
menu.js

Moved selection details and unit commands code out into:
selection_details.js
unit_commands.js

Deleted some unused sprites

This was SVN commit r7659.
2010-07-01 20:31:47 +00:00
6d625fdc55 Added resource quantities to GUI for resource entities
Some code cleanup

This was SVN commit r7657.
2010-07-01 20:06:23 +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
303a3ff437 Fix line endings
This was SVN commit r7652.
2010-06-30 21:34:44 +00:00
1f7bb6c1fc Applied new theme (thinWheatWindow)
Added bronze rectangles behind resources
Made queue panel resize if needed

This was SVN commit r7646.
2010-06-29 15:54:53 +00:00
26bdae945b New style: thinWheatWindow
(same as wheatWindow, but thinner borders)

This was SVN commit r7645.
2010-06-29 15:51:11 +00:00
f21f8485e8 Added MAX_SELECTION_SIZE (24) to bandboxed selections
Cleaned up button layout code

This was SVN commit r7644.
2010-06-28 12:30:59 +00:00
21b1f1c965 Cut off panel on right side at 1024 for wide resolutions
Larger selection icons (Max of 16 now instead of 18)

This was SVN commit r7643.
2010-06-28 00:31:24 +00:00
e15f6120b1 Fixed minimap (z-value was making it unclickable)
Made stamina bar visible for player owned units only

This was SVN commit r7642.
2010-06-27 21:45:07 +00:00
08710e4dd6 New GUI design - marble edges instead of bronze edges
Overall layout changes (lower panel is shorter)

Moved presetting of shadows and fancy water into
session.xml from session.js using action on="Load"

This was SVN commit r7640.
2010-06-27 18:45:39 +00:00
a947ab5582 Fixed alignment issue with the left and right sides of the right marble border in the wheatWindowSand sprite
This was SVN commit r7639.
2010-06-27 18:40:44 +00:00
b80a3bece3 This was SVN commit r7638. 2010-06-27 18:28:16 +00:00
786bd5d11a New basic GUI designed roughly off of AoE3 - ALPHA 1
Features:
-Basic menu and settings dialog
-New look for panel
-Multiple unit selections are now visible in GUI

This was SVN commit r7635.
2010-06-26 18:10:03 +00:00
f1d23f203e Clone the current session GUI files
This was SVN commit r7634.
2010-06-26 17:11:04 +00:00
2c160e5bd8 Delete script scheduler, since it causes GC crashes and isn't used for anything important and could be implemented in pure JS instead.
This was SVN commit r7622.
2010-06-07 18:41:03 +00:00
5c9d0c17e2 Change default building placement angle by 45 degrees
This was SVN commit r7621.
2010-06-07 18:14:18 +00:00
d76a2e342b Delete obsolete entity template files
This was SVN commit r7620.
2010-06-07 09:50:44 +00:00
c8edf0e9e2 This was SVN commit r7619. 2010-06-07 02:48:02 +00:00
37798136c2 Actor animation tweaks for Greek archers.
This was SVN commit r7618.
2010-06-07 02:43:09 +00:00
95fd92ad3a This was SVN commit r7616. 2010-06-06 23:43:59 +00:00
965b661e81 This was SVN commit r7615. 2010-06-06 23:42:55 +00:00
f7d50b3f17 Try to fix animation speeds for a couple of units
This was SVN commit r7614.
2010-06-06 20:49:41 +00:00
72f0638a4b Delete obsolete entity template files
This was SVN commit r7613.
2010-06-06 20:38:44 +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
d3048906cb # Unit animation improvements.
Animate props much more sensibly.
Move ammo code out of CUnit.
Move animation logic out of CModel.
Launch projectiles from the correct location.
Use entity's speeds and sounds in actor viewer.
Add -nosound option to disable audio, and allow audio by default in
Atlas.
Remove some obsolete options.

This was SVN commit r7609.
2010-06-05 00:49:14 +00:00
0f611042b1 # Support alt+enter to toggle fullscreen mode. Make game window resizable.
Refactor the video mode setting logic to cope better with dynamic
changes.

This was SVN commit r7606.
2010-06-03 19:07:59 +00:00
23ab6dad38 Make session GUI visible and usable when playtesting from Atlas.
Fix Atlas icon on non-Windows.
Remove some nonexistent-hotkey config.

This was SVN commit r7602.
2010-06-02 00:36:21 +00:00
6de0cdc5f9 Delete old obsolete font builder tool and related files
This was SVN commit r7599.
2010-05-31 19:04:39 +00:00
7af705435f Some custom maps
This was SVN commit r7598.
2010-05-30 21:16:32 +00:00
7dca91f26b # Various changes to the text rendering system.
Rewrite font builder tool to be much simpler and to support more text
effects.
Change GUI to use new set of fonts.
Switch font textures from TGA to PNG so they're easier for the font
builder to create.
Support RGBA font textures (for e.g. stroked text).
Greatly improve text rendering performance by using vertex arrays.
Fix rendering code leaving vertex buffers bound.
Add 'clip' property to GUI text objects, to disable clipping when
rendering.
Delete part of unused console function registration system.

This was SVN commit r7595.
2010-05-30 13:42:56 +00:00
5b9d29729a Windows fixes
This was SVN commit r7592.
2010-05-27 23:51:14 +00:00
e6cab58194 Add map for testing terrain passability and movement costs
This was SVN commit r7591.
2010-05-27 23:32:59 +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
828400d82e # Support floating units in new simulation system.
Fix rendering of underwater lines.
Fix rendering of unit selection outlines in Atlas.
Remove some obsolete hotkeys.

This was SVN commit r7589.
2010-05-27 23:23:53 +00:00
47a03c3397 Replace JS_Enumerate with manual enumeration, to avoid its memory allocations.
Use LookupProperty to avoid having to check for getters.
Add a quicker method of rooting many script values.

This was SVN commit r7579.
2010-05-25 18:24:12 +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
739b25dc22 Fix script error when audio is disabled
This was SVN commit r7567.
2010-05-22 14:29:55 +00:00
ab7c9a9879 Generic ambience
This was SVN commit r7560.
2010-05-21 15:15:34 +00:00
4f13623099 Implementation of basic ambient sounds
This was SVN commit r7559.
2010-05-21 15:13:35 +00:00
6e6ae573e4 Delete old session GUI files.
This was SVN commit r7558.
2010-05-20 20:17:46 +00:00
56bb858802 # Delete a lot of obsolete simulation code.
This was SVN commit r7555.
2010-05-20 18:09:23 +00:00
c684c211a2 # Basic experimental multiplayer integration with new simulation system.
Add new turn manager that should be more correct and potentially more
efficient.
Remove evil CNetServer/CNetClient multiple inheritance of CTurnManager.
Add multiplayer autostart.
Various minor cleanups.

This was SVN commit r7551.
2010-05-20 00:59:01 +00:00
8c1a3f7c8a Protect against missing globals when loading GUI in unusual ways
This was SVN commit r7550.
2010-05-20 00:57:03 +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
91522c6f58 This was SVN commit r7539. 2010-05-12 04:42:32 +00:00
434248167b Fix warnings in tests
This was SVN commit r7535.
2010-05-10 09:52:35 +00:00
ecccf4c0d7 Added <soundgroup> for cavalry steps XML and added Run to infnatry
This was SVN commit r7534.
2010-05-10 00:17:24 +00:00
86d117d623 Introduced a infantry "run" XML file
This was SVN commit r7533.
2010-05-10 00:15:29 +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
c0a0e0bdbd Make the session GUI slightly more resilient to broken data files
This was SVN commit r7531.
2010-05-09 21:43:24 +00:00
549ff09c8b Added XML for generic animal death and fixed horse death xml
This was SVN commit r7529.
2010-05-09 18:34:40 +00:00
8defd5aaa3 Fix footstep sounds
This was SVN commit r7528.
2010-05-09 14:45:19 +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
4daf1ea92c Adjusted the levels so this was a little more present in the overall mix
This was SVN commit r7526.
2010-05-09 01:46:46 +00:00
a9ae34e864 Fixed mounted folder structure to reflect the other entities and added mounted deaths with xml
This was SVN commit r7525.
2010-05-09 01:38:33 +00:00
328f711dc4 Added "gathering.xml" which now references to audio/resource/farming/ in order to share hoeing sounds for the alpha release
This was SVN commit r7524.
2010-05-09 01:23:26 +00:00
1738da1c3e Add 'pause' command back into new session GUI
This was SVN commit r7523.
2010-05-09 01:13:56 +00:00
145a4b65aa Fixed walking sound to match animation and to fix a phase issue when multiple instances are played at the same time
This was SVN commit r7522.
2010-05-09 01:12:43 +00:00
549ec9d561 Fix units attacking rocks and trees instead of gathering resources from them
This was SVN commit r7520.
2010-05-09 00:44:33 +00:00
c75029b6ab Allow shift+click for multiple building placement
This was SVN commit r7519.
2010-05-09 00:25:03 +00:00