sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
3,579 Commits 8 Branches 28 Tags 13 GiB
b8456f0702
Commit Graph

225 Commits

Author SHA1 Message Date
Matei
422c1e1bc4 Construction JavaScript and XML changes, at least for houses (still need to convert the other building types over). 
This was SVN commit r3565.
 2006-02-26 09:56:47 +00:00
Acumen
da2178db66 Basic progress bar UI at the start of the game requested by Jan, so player is aware of and can cancel archive building. 
(Note that the Esc key is now used here, so you'll have to use another
key ... Ctrl+F4/Alt+F4/Ctrl+Break to quick-kill the game.)

Also set Matei's StartProduction to use entity's creation time.

This was SVN commit r3556.
 2006-02-23 18:22:30 +00:00
Matei
7a4aeb69ed Added production queue system and associated events. It might still need some extra features but it should be functional. 
This was SVN commit r3547.
 2006-02-22 22:45:16 +00:00
Wijitmaker
022c84f43d formation test1 
This was SVN commit r3546.
 2006-02-22 07:25:30 +00:00
Wijitmaker
acbed7a656 Vercingetorix, our first Celtic hero (minus his horse) 
This was SVN commit r3545.
 2006-02-21 10:56:02 +00:00
pyrolink
9c739099fc Various fixes to notifications and orders 
Added escort--follow can be done by simply changing the default and
secondary actions from NOTIFY_ESCORT to NOTIFY_FOLLOW in
entityEventTargetchanged.

Bugs are: ranged units can't assist in attacking from some reason, and
when you tell a leading unit to run, the escorting unit doesn't.

This was SVN commit r3503.
 2006-02-13 03:28:36 +00:00
Matei
b0e7b7d03e Fixed a bug that was causing resources to go to NaN when you killed something. 
This was SVN commit r3502.
 2006-02-13 02:06:57 +00:00
Acumen
3e2017147d Snazzier resizing resource counters and some miscellaneous fixes. 
This was SVN commit r3460.
 2006-02-03 03:15:49 +00:00
Matei
83ccd72798 Tiny fix to the "unit AI" in the damage event handler to make ranged units fight back when attacked. 
This was SVN commit r3423.
 2006-01-24 11:08:53 +00:00
Matei
c29c222936 Fixed a JS error message when corpses were attacked (because they had no 
armour).

This was SVN commit r3418.
 2006-01-23 10:36:18 +00:00
Matei
1c541db46b Health regen fix for ranged attack. 
This was SVN commit r3410.
 2006-01-23 03:55:35 +00:00
Mythos_Ruler
16341dd834 Fixed someone else's "fix"... The Celts don't get a wall tower, they get a wall turret, which is not the Scout Tower, which someone made it into. :) Sooooooo, I changed the actor in the entity back from the scout_tower to the wall_turret. 
This was SVN commit r3408.
 2006-01-23 03:20:28 +00:00
Wijitmaker
199550457d to entities that I'm adding to fix errors 
This was SVN commit r3407.
 2006-01-23 02:34:38 +00:00
Matei
d5a4c87dcc Fixes to the melee/ranged attack split. 
This was SVN commit r3404.
 2006-01-22 11:55:47 +00:00
pyrolink
b1537950e2 fixes 
This was SVN commit r3400.
 2006-01-22 11:08:27 +00:00
pyrolink
0e861e5ab1 Thank Stuart for the new attack properties (split into ranged and melee). Also, if running, the unit will use crush damage instead of melee. 
This was SVN commit r3395.
 2006-01-22 08:51:34 +00:00
Mythos_Ruler
c3b289ec0b new demetrius entity to test animations 
This was SVN commit r3392.
 2006-01-22 06:39:55 +00:00
Acumen
b32a8361e5 AI stance properties and extended animal templates. 
This was SVN commit r3390.
 2006-01-22 05:28:41 +00:00
pyrolink
5383104a4f Added health regen/decay with time delay, corrected continual run bug (once running, disregards reorders to walk until destination reached). 
This was SVN commit r3377.
 2006-01-21 11:01:08 +00:00
Matei
c85551a8b0 Renamed processAttack, entityEventAttack, entityDamage, etc to avoid confusion since several people didn't like the functions having different names than the properties of the entity object. Now the generic action handlers are called performAttack, performGather, etc and the damage function is simply called damage. 
This was SVN commit r3374.
 2006-01-20 21:37:45 +00:00
Acumen
30b83db67b Moved Run up to affect other units. Also added an Iberian house, which for some reason went AWOL during the entity revision. 
This was SVN commit r3368.
 2006-01-18 03:31:21 +00:00
Mythos_Ruler
cadbd77bc7 A temp Themistocles to test Wijit's cool new animations. 
This was SVN commit r3367.
 2006-01-17 08:12:10 +00:00
pyrolink
01ff2fdf3b Secondary order script support; run order addition 
This was SVN commit r3362.
 2006-01-16 10:55:01 +00:00
Acumen
98496f2434 Added Matei's instructions to add a new generic order to the entity script. Not much of a contribution, but every little helps, eh? :) 
This was SVN commit r3360.
 2006-01-16 02:01:24 +00:00
NoMonkey
cf224a6267 This was SVN commit r3357. 2006-01-13 05:00:55 +00:00
NoMonkey
d261d33bab This was SVN commit r3352. 2006-01-12 10:15:20 +00:00
Acumen
66d780eb49 Some fixes to the resource pool counters to make them dynamically lengthen based on caption length, and to adjust Housing / Population when buildings and units are created. (It probably doesn't yet deny creation of a unit if it would exceed population limit, though.) Also fixed a bug where an attempt to modify a resource value failed if it was zero. 
This was SVN commit r3351.
 2006-01-11 15:12:41 +00:00
Acumen
9a7fb2d090 A few more manual fixes. 
This was SVN commit r3348.
 2006-01-09 15:58:42 +00:00
Wijitmaker
e45a9afaf0 run tweaks 
This was SVN commit r3347.
 2006-01-09 03:28:31 +00:00
Wijitmaker
5633336231 trying to test out the running stuff - deleting some old actors for the celts we no longer need 
This was SVN commit r3346.
 2006-01-09 03:13:45 +00:00
Acumen
a08bf7b52e Fixed some glitches in my entityInit code. Changed erroneous UP references to XP and promotion. 
This was SVN commit r3344.
 2006-01-08 14:01:10 +00:00
pyrolink
8f7202f00b Entities default to run speed = 0 
Notification event

This was SVN commit r3340.
 2006-01-08 08:23:59 +00:00
pyrolink
1c43192f2d All units start out with 0 run speed. 
This was SVN commit r3330.
 2006-01-05 06:16:35 +00:00
Mythos_Ruler
7cb9a4a084 Fixed the entity pointing to incorrect actor 
This was SVN commit r3327.
 2006-01-02 09:09:36 +00:00
Matei
0a3e9ec537 - Added pause game functionality. 
- Removed CDamageType from the engine - damage is now handled only
within the entity script (easier to mod/modify).

This was SVN commit r3325.
 2006-01-02 03:07:29 +00:00
Wijitmaker
5487d069c4 Female fixes - new head, new head texture, new dress mesh, new celtic texture 
This was SVN commit r3321.
 2005-12-31 12:16:52 +00:00
Wijitmaker
892ae838ef Fixing the phalanx stuff - new shields, and a walk animation 
This was SVN commit r3317.
 2005-12-31 02:09:18 +00:00
Matei
0b6b971ee8 Generic orders data commit (changes to the entity scripts and XML's). 
This was SVN commit r3310.
 2005-12-29 08:43:38 +00:00
Wijitmaker
9190ddf9ba fixed some collision radius issues 
This was SVN commit r3290.
 2005-12-27 00:27:07 +00:00
Wijitmaker
d8149fe9a1 Doh, one more fix for some history and naming updates for the celtic dock 
This was SVN commit r3280.
 2005-12-22 05:55:59 +00:00
Wijitmaker
75113dae35 few more tweaks to entities 
This was SVN commit r3279.
 2005-12-22 05:52:36 +00:00
Wijitmaker
c6c0e0422d Fixed some entities and added the missing greek ships 
This was SVN commit r3278.
 2005-12-22 05:35:35 +00:00
Matei
8f5b5b7b73 Added time parameter on infidelity aura (currently sheep convert instantly but female citizens take 10 seconds). 
This was SVN commit r3271.
 2005-12-18 07:30:11 +00:00
Wijitmaker
74b8c5b15f More Greek unit tweaks 
This was SVN commit r3266.
 2005-12-17 20:45:27 +00:00
Matei
1bedd9457a - Fixed the issue that was causing crashes when you tried to place one of them. They had 2 problems: first the template_structure_special whose parent was itself, as Phillip pointed out, but second also incorrect actor names. I also made the Carthaginian wall refer to the right parent template. 
- Added a "dropsite" aura to mills, farmsteads and civil centers, and
modified the gathering code so you can only gather objects that have
this aura on them from one of these buildings. You can also add a
traits.supply.forageable tag to an entity to make it ignore the
requirement for dropsites and gather it wherever it is. I did this for
hunting, so you can hunt without being near a farmstead.

This was SVN commit r3265.
 2005-12-17 09:28:26 +00:00
Matei
7af724889c Updated unit training to work with the new entities. 
This was SVN commit r3261.
 2005-12-16 22:52:10 +00:00
Acumen
cf4c27f2a9 Changed the create lists for the Civ Centres so they'e no longer invalid (needs to point to the _b versions of CSes). 
This was SVN commit r3260.
 2005-12-16 16:21:40 +00:00
Wijitmaker
299248ec46 Entity fixes, new greek material 
This was SVN commit r3259.
 2005-12-16 13:03:53 +00:00
Matei
4de14f47f7 Sheep should no longer be overly fond of trees & rocks. 
This was SVN commit r3258.
 2005-12-16 07:22:40 +00:00
Matei
54194e49ec This was SVN commit r3256. 2005-12-16 07:13:13 +00:00
Acumen
3dc4d7d184 Removed the gaia_ designation from gaia entities, at Jason's request. 
This was SVN commit r3254.
 2005-12-16 05:37:27 +00:00
Matei
96df45e83d This was SVN commit r3252. 2005-12-15 23:20:53 +00:00
Matei
6578c2c05c Added the new entities. 
This was SVN commit r3251.
 2005-12-15 22:58:31 +00:00
Matei
b14dc940ef New entities and associated changes to scripts. 
This was SVN commit r3248.
 2005-12-15 21:55:18 +00:00
Wijitmaker
00a15f0ccb Here are the celt ships! 
This was SVN commit r3244.
 2005-12-14 09:23:15 +00:00
Matei
15be1474bc Archers should now be able to fire, though I don't know what exactly the problem was (it seems that you need the "event" parameter to be 0.5 and the "load" parameter to be 0 in the animation for it to work, and the animation is not completely right; not sure if this is intended). 
This was SVN commit r3243.
 2005-12-14 04:53:53 +00:00
Matei
e4cf72e949 Rewrote InfidelityAura in a more correct way (if there are units from several players but none from your owner near you, you should switch to the player with the most units, not remain with your current owner; also, don't count other infidel things as units of your own player near you, so groups can be converted together). 
This was SVN commit r3240.
 2005-12-13 21:43:08 +00:00
Matei
0eb7108272 Added aura scripts and 3 auras: a Courage aura of 15 on Themistocles and 5 on Alexander, a Fear aura of 5 on Leonidas, and an Infidelity aura on female citizens. 
This was SVN commit r3237.
 2005-12-13 08:03:49 +00:00
Matei
2e5d310c56 Trees can no longer move. 
This was SVN commit r3231.
 2005-12-11 23:28:08 +00:00
Matei
a5f9789940 Fixes to entity death and event handling (buildings should no longer be able to move, all units should be able to die). 
This was SVN commit r3225.
 2005-12-11 02:08:24 +00:00
Wijitmaker
48ef5c0a32 Greek Ships! 
This was SVN commit r3189.
 2005-12-03 00:50:19 +00:00
Wijitmaker
c38352703e Greek horse cavalry stuff 
This was SVN commit r3132.
 2005-11-13 11:38:29 +00:00
pyrolink
139698ec1d Entity heal update. 
This was SVN commit r3129.
 2005-11-13 06:43:04 +00:00
Wijitmaker
f27cab84f8 Finishing of the last of the greek buildings for Milestone VII 
This was SVN commit r3126.
 2005-11-09 09:53:50 +00:00
Wijitmaker
ab0afbb299 Celt special building 
This was SVN commit r3076.
 2005-11-01 10:33:09 +00:00
Wijitmaker
9f7de4bd3a Celt wall entities 
This was SVN commit r3073.
 2005-11-01 04:43:35 +00:00
Wijitmaker
ae87ca51aa Celtic Fortress, and scale fix for the Celtic tower (to match the other towers in height) 
This was SVN commit r3031.
 2005-10-26 09:55:49 +00:00
Wijitmaker
5bf15b107d Hero Thermistocles! 
This was SVN commit r2989.
 2005-10-23 05:26:49 +00:00
Wijitmaker
aba61336b7 Ooops forgot some xenophon files 
This was SVN commit r2987.
 2005-10-22 10:17:35 +00:00
Wijitmaker
0d5ce47915 Leonidas Hero 
This was SVN commit r2943.
 2005-10-15 04:15:02 +00:00
Wijitmaker
30b80c032d Alexander Hero (hopefully I included everything) 
This was SVN commit r2900.
 2005-10-11 11:59:26 +00:00
Acumen
3414e847be Updated the temporary Bireme so it inherited from the ship template instead of the Female Citizen (which was fairly disturbing). 
This was SVN commit r2883.
 2005-10-09 14:22:55 +00:00
Matei
7fc8713794 Made the LOS properties slightly more realistic. 
This was SVN commit r2874.
 2005-10-09 03:00:03 +00:00
Acumen
5070ced96f Properties for LOS for Matei: traits.vision.los (structures, units), traits.vision.permanent (structures, gaia). 
This was SVN commit r2872.
 2005-10-08 23:00:39 +00:00
Mythos_Ruler
932cab0da1 This was SVN commit r2849. 2005-10-05 07:37:34 +00:00
Wijitmaker
72d71ae3a9 renamed some shoreline textures, painted the terrain on the 0ad map, and fixed a bad link in the roman barracks entity 
This was SVN commit r2847.
 2005-10-05 05:03:21 +00:00
Acumen
7abf24b6c6 Possible speed optimisation for gaia entities (don't inherit the usual events and the entity script). 
This was SVN commit r2842.
 2005-10-03 20:57:10 +00:00
Mythos_Ruler
8bb6a6b56f This was SVN commit r2831. 2005-10-03 04:52:02 +00:00
Ykkrosh
75b291931d Actor reorganisation 
This was SVN commit r2763.
 2005-09-23 03:54:51 +00:00
Matei
173b060668 Changed entity script to to allow Gaia units to be attacked (gather will still be higher priority though). 
This was SVN commit r2753.
 2005-09-19 01:20:23 +00:00
Matei
bc3949db1a Added a fairly primitive water plane. This includes several things: 
- Hotkeys Q, A, Z to toggle, raise and lower the water plane
respectively.
- A unit trait, named anchor, that says whether it attaches to the
terrain or the water.
- Small changes to rendering code.

This was SVN commit r2744.
 2005-09-18 03:16:12 +00:00
Wijitmaker
a98ee94af9 A ship for testing purposes. 
This was SVN commit r2740.
 2005-09-17 11:18:45 +00:00
Acumen
58fbafbbdd Command buttons can finally invoke the building painter or train units. Still plenty of glitches (particularly click-fest issues ... still an issue when updating the buttons directly rather than via hack, so it's probably due to constant onPress refresh). I've also had to disable the progress bar until I can make it work properly, but if you can get a unit in the queue it should eventually spawn. :) 
This was SVN commit r2727.
 2005-09-14 22:47:51 +00:00
Matei
2aca87419f This was SVN commit r2724. 2005-09-14 19:42:58 +00:00
Acumen
4ab25c7274 * Fixed the "can't interact with the world" glitch. Turns out it was my fault. :) 
* Restored the resource pool (and cleaned up the JS interface to it ...
array and counters are updated in one spot (wrapper functions to
add/deduct/define), without need for constant refresh).
* Added crude boxes in game setup to enter initial resource value.
* The command buttons still don't work when clicked (and clicking
continues to be erratic, only triggering if hammering the mouse button
... I think it's related to the return function() hack Philip set up),
but that's next on the list. :)
* Oh, and the command buttons don't currently realign to the different
corners with Alt+G, but all the rest should.

This was SVN commit r2715.
 2005-09-14 00:50:25 +00:00
Matei
5f2857b6b8 Modified health bar height on buildings and added default of -1.0 (which means don't display health bar) on all entities. 
This was SVN commit r2676.
 2005-09-06 19:29:31 +00:00
Acumen
d867f0c5fc box_height parameter for Matei. 
This was SVN commit r2673.
 2005-09-06 00:51:18 +00:00
Acumen
0014fe0e27 Temporary animal entities for Matei's RM development. 
This was SVN commit r2542.
 2005-07-25 03:04:02 +00:00
Wijitmaker
2eafe4ef92 some entity tweaks - change unit footprint size and attack rates 
This was SVN commit r2353.
 2005-05-27 05:01:01 +00:00
Acumen
43d04d0f31 Some little scripting fixes Jason noticed. 
This was SVN commit r2343.
 2005-05-23 22:03:55 +00:00
olsner
c8b851eda9 - JS functions to make use of new ordering and interaction APIs 
- selectLocation and selectEntity using the new interaction API
- Implemented attack and patrol buttons using select{Location,Entity}

This was SVN commit r2317.
 2005-05-18 05:35:25 +00:00
Wijitmaker
85497b4ebc dudes die faster when attacking 
This was SVN commit r2309.
 2005-05-14 06:30:09 +00:00
Aeros
07835e70e5 complete bush set for the Temperate and Mediterreanean biomes. 
This was SVN commit r2294.
 2005-05-12 09:10:53 +00:00
MarkT
86dc351205 Projectile code and updates to some actors that can use it (celt_ijv and hele_iar) 
This was SVN commit r2266.
 2005-05-10 07:13:25 +00:00
MarkT
db168702df Jason's animation events. Also reworked entity-types system. 
This was SVN commit r2209.
 2005-05-01 19:09:13 +00:00
Acumen
53f9347029 Slight update to make the gather cursors work by subtype, and added a bunch of placeholder cursors shamelessly ripped from AoM. Any artist that feels like making non-copyrighted replacements would be most welcome. (Ironically, I could find few usable cursors for the different food types.) 
This was SVN commit r2201.
 2005-04-30 23:42:01 +00:00
Acumen
657ef07006 Accounting for removed swordsman in Celtic CC. 
This was SVN commit r2200.
 2005-05-12 17:17:28 +00:00
Acumen
57b634999e Advanced and Elite rank entities for all the civs. 
This was SVN commit r2191.
 2005-04-29 01:37:25 +00:00
Wijitmaker
b3c83ac2f1 hmm, must this was pointing to the csw instead of the csp, so fixed 
This was SVN commit r2186.
 2005-04-28 09:21:16 +00:00
Wijitmaker
faf5a942dc removed celt CS swordsman 
This was SVN commit r2181.
 2005-04-27 12:58:25 +00:00