1
0
forked from 0ad/0ad
Commit Graph

3047 Commits

Author SHA1 Message Date
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