Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
3,241 Commits 2 Branches 28 Tags 13 GiB
ef155571c0
Commit Graph

999 Commits

Author SHA1 Message Date
Wijitmaker
b48dc75fe8 Here are some civ icons 
This was SVN commit r3611.
 2006-03-08 07:32:39 +00:00
janwas
4fe718f536 committing a nice and big trace file; will be updated periodically. this is a bit more thorough (-> better archive) than a trace generated from quick test runs. 
This was SVN commit r3607.
 2006-03-05 18:57:56 +00:00
Wijitmaker
4b3997f1f6 update for small entity icons 
This was SVN commit r3604.
 2006-03-04 21:27:31 +00:00
Acumen
780e441117 Moved some icon locations. 
This was SVN commit r3600.
 2006-03-04 18:28:52 +00:00
Acumen
6e35ac1554 This was SVN commit r3599. 2006-03-04 18:28:13 +00:00
Acumen
8d3222f9e2 Missing Optimus Princeps font. 
This was SVN commit r3598.
 2006-03-04 18:00:31 +00:00
Acumen
d55593abf9 SVN seems to have become confused by the replaced icons. So deleted the tree and recommitted them to hopefully get back in sync. 
This was SVN commit r3597.
 2006-03-04 17:57:02 +00:00
Acumen
c0875f6d95 This was SVN commit r3596. 2006-03-04 17:55:25 +00:00
Wijitmaker
a793889a8b UI overlay portraits 
This was SVN commit r3595.
 2006-03-04 12:48:24 +00:00
Acumen
6c67e84ecd * Added player colour to player name, using Matei's new getColour() function. 
* Used the actual player names instead of sharing the profile name
(though the default names are a bit lengthy and extend off the UI; need
to figure out how to change those during game setup using each player's
profile name).

* Fixed health/stamina bug.

* Added an onMouseEnter() event for tabs at Matei's suggestion (so the
tabs will open simply by getting the cursor in proximity, instead of
needing two clicks).

This was SVN commit r3592.
 2006-03-04 00:20:09 +00:00
Acumen
0abb49ab09 * Removed portrait background from the large status portrait (by changing default sprites for all entities). 
* Made tabs remain closed by default.

* Fixed error where foundations were referencing the older cell sheets.

* Added text equivalents for health and stamina.

This was SVN commit r3588.
 2006-03-03 19:05:01 +00:00
Acumen
c9250bd415 GUI Updates: 
* Implemented Jason's new tabs for portraits. Shuffled buttons around a
bit.
* Started on Status Pane elements ... portrait, health and stamina bars,
garrison and supply counters, and descriptive text.

This was SVN commit r3585.
 2006-03-03 00:02:01 +00:00
Wijitmaker
7fe7ddb6a1 yay, nice looking images - no lossless issues 
This was SVN commit r3584.
 2006-03-02 11:11:22 +00:00
janwas
03da3b23a1 hook up to builder; call archiveBuilderCancel 
This was SVN commit r3577.
 2006-03-01 22:17:02 +00:00
Acumen
083d6f6104 Did more updates to commands. 
* Pick lists should now display, though no events yet. (Except I've
disabled them for now, as their condition checks will fail in most
cases.)
* Building lists should now provide a building cursor when clicked, so
Matei can work on his stuff (though it gets a bit glitchy after that ...
The UI expects a portrait name and ID from the foundation, for example,
and so fails to find them and therefore continue to refresh the command
lists.)

This was SVN commit r3576.
 2006-03-01 20:23:09 +00:00
Wijitmaker
65ddbcf2f9 new backgrounds 
This was SVN commit r3575.
 2006-03-01 09:23:44 +00:00
Acumen
33c2877065 Jason's new Status Pane backdrop. 
This was SVN commit r3574.
 2006-02-28 18:27:38 +00:00
Acumen
238ea155f3 Last update for tonight ... Tabs and commands are now displaying (albeit very fragilely due to unpredictable error-checking), "pick lists" and events still disabled while I work on getting them right. Also need to reshuffle button locations later when adapting to Jason's new Status Pane shape. 
This was SVN commit r3573.
 2006-02-28 07:03:35 +00:00
Acumen
268584d177 Initial commit of GUI changes. You're not liable to see much difference (in fact, there's probably less functionality than there used to be). 
This is mostly to commit the new icon sheets so Jason can commit changes
directly if he prefers, and because I'm about to get back onto fixing
the command lists (not necessarily ones that actually do things when you
click them, but at least get them updating properly on the screen for
Matei), and want to commit a semi-usable update before I potentially
break it all again.

This was SVN commit r3571.
 2006-02-27 23:37:43 +00:00
Acumen
cbdc4e9686 Quick fix in the init(), where non-foundations seemed to produce errors (since their building property would be undefined). Just added an extra if check. 
This was SVN commit r3570.
 2006-02-27 04:58:04 +00:00
Matei
24a1ce0fd0 Removed an XMB file that got added to version control for some reason. 
This was SVN commit r3569.
 2006-02-26 22:51:43 +00:00
Matei
c55b49164a Tweaked foundations' LOS so it depends on their sizes. 
This was SVN commit r3567.
 2006-02-26 22:25:17 +00:00
Matei
2e26b5e1da Added foundations for all the building types. 
This was SVN commit r3566.
 2006-02-26 22:10:01 +00:00
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
Wijitmaker
2aebdd1894 another update 
This was SVN commit r3561.
 2006-02-25 12:54:11 +00:00
Acumen
0be99c65bf Removed hourglass from archive builder screen since it was ambiguous (user does have input, and can just click to skip that screen -- which isn't used at present anyway). 
Also restored the Esc key to its previous role of quick-quit, as I'm
just too used to using it. :)

This was SVN commit r3560.
 2006-02-24 18:12:54 +00:00
Wijitmaker
ffcd73ad96 played around with the icons a bit more 
This was SVN commit r3559.
 2006-02-24 10:50:38 +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
Wijitmaker
e959e59614 icon demos 
This was SVN commit r3555.
 2006-02-23 12:01:37 +00:00
Wijitmaker
a52365f90a ranked stuff 
This was SVN commit r3552.
 2006-02-23 07:07:58 +00:00
Acumen
a4c10bba1e Quick fix to change to a "wait" hourglass cursor while the game is loading. Note that the placeholder icon has been ripped from AoM and should be replaced before we ship. :) 
This was SVN commit r3551.
 2006-02-23 04:23:35 +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
Mythos_Ruler
a40b3d38ae Mythos' lighting tweak. 
This was SVN commit r3544.
 2006-02-21 03:57:10 +00:00
Mythos_Ruler
e0fe2b7253 This was SVN commit r3538. 2006-02-19 02:42:52 +00:00
Mythos_Ruler
008d487d2c This was SVN commit r3537. 2006-02-19 02:40:40 +00:00
Mythos_Ruler
6d0a9c6d04 This was SVN commit r3536. 2006-02-19 02:39:49 +00:00
prefect
7396587f6e Fix scenario DTD 
This was SVN commit r3517.
 2006-02-15 05:49:14 +00:00
prefect
36fa5ec2bf * clean up CLightEnv a bit 
* add CLightEnv::m_TerrainShadowTransparency
* shadows will let a fraction of diffuse light through
* added JS LightEnv objects, so the lighting environment can be changed
  from the console
* new element TerrainShadowTransparency supported in the scenario .xml
format,
  changed cantabrian_generated with an example

This was SVN commit r3513.
 2006-02-15 00:45:16 +00:00
Wijitmaker
e3c3ac920f lighter shadows for cantabrian_generated.xml 
This was SVN commit r3510.
 2006-02-14 05:20:17 +00:00
prefect
7dee30e24c - Terrain self-shadows (only noticeable with a low angle of sun) 
- explicitly split ambient and diffuse
- add renderer.shadowZBias to bias depths in the depth texture
  and avoid flickering artifacts caused by Z fighting
- cantabrian_generated uses new light values so that shadows aren't
pitch
  black

This was SVN commit r3508.
 2006-02-13 14:18:20 +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
Mythos_Ruler
56d8d31cd0 This was SVN commit r3485. 2006-02-08 07:26:32 +00:00
Mythos_Ruler
51cbee9f39 Gave the fauna horse random textures 
This was SVN commit r3484.
 2006-02-08 02:25:30 +00:00
Matei
7397615b5b Reenabled shadows (it was misspelled as shadow=true instead of shadows=true). 
This was SVN commit r3481.
 2006-02-05 06:50:24 +00:00
pyrolink
54101c169f Queue binding 
This was SVN commit r3477.
 2006-02-05 03:42:05 +00:00
Mythos_Ruler
41f08eecb8 Seems we didn't have just a "plain white" terrain... so I made one. 
This was SVN commit r3463.
 2006-02-03 07:00:28 +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
Wijitmaker
22be4ee0d6 temp ships with props 
This was SVN commit r3455.
 2006-02-01 10:53:10 +00:00
Mythos_Ruler
efc45aac23 This was SVN commit r3453. 2006-02-01 00:58:17 +00:00
Mythos_Ruler
79767e2e1b This was SVN commit r3452. 2006-02-01 00:57:44 +00:00
Mythos_Ruler
f5dec3e4ab This was SVN commit r3451. 2006-02-01 00:57:19 +00:00
Matei
6eb9bfa730 Reenabled shadows in system.cfg. 
This was SVN commit r3445.
 2006-01-29 23:54:29 +00:00
pyrolink
bbbb9e12af -hotkey for cinematic interface (not working) 
This was SVN commit r3443.
 2006-01-29 23:27:16 +00:00
Aeros
6699dc11c7 This was SVN commit r3435. 2006-01-29 03:59:32 +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
Acumen
72cc581c2e Renamed Decay to Corpse for all actor animations, and added extra animations to Basic Celt Infantry Spearman and Javelinist for testing purposes. 
This was SVN commit r3419.
 2006-01-23 16:16:59 +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
Wijitmaker
cdd432ba46 updating the tips file to some latin 
This was SVN commit r3409.
 2006-01-23 03:38:45 +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
Aeros
111b5cf42d This was SVN commit r3393. 2006-01-22 08:07:23 +00:00
Mythos_Ruler
c3b289ec0b new demetrius entity to test animations 
This was SVN commit r3392.
 2006-01-22 06:39:55 +00:00
Mythos_Ruler
5c5c6cd469 New actors to play with new animations 
This was SVN commit r3391.
 2006-01-22 06:37:51 +00:00
Acumen
b32a8361e5 AI stance properties and extended animal templates. 
This was SVN commit r3390.
 2006-01-22 05:28:41 +00:00
Wijitmaker
bda61f8030 2 handed spear animations 
This was SVN commit r3380.
 2006-01-21 10:53:03 +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
livingaftermidnight
5dd1dba521 This was SVN commit r3370. 2006-01-19 11:32:09 +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
Mythos_Ruler
d6ec773887 Two-sworded Themistocles to test out Wijit's new "wild and crazy" animations. 
This was SVN commit r3366.
 2006-01-17 08:10:56 +00:00
pyrolink
01ff2fdf3b Secondary order script support; run order addition 
This was SVN commit r3362.
 2006-01-16 10:55:01 +00:00
Wijitmaker
2cc7221166 dual sword attack animations 
This was SVN commit r3361.
 2006-01-16 09:58:03 +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
Wijitmaker
dafc496b6f Some sword attack animations and a few new deaths 
This was SVN commit r3359.
 2006-01-15 11:49:29 +00:00
thedrunkyak
052e08717e Updated Video Menu, Fixed Audio Menu, Started Game Options Menu 
This was SVN commit r3358.
 2006-01-14 13:54:49 +00:00
NoMonkey
cf224a6267 This was SVN commit r3357. 2006-01-13 05:00:55 +00:00
Acumen
740d4ab616 Slight adjustments to options screen (fixed invalid style pgBorder, moved exit buttons to corners now that there's a Cancel, added floating tooltips). Looking good, though, Dan! (y) 
This was SVN commit r3356.
 2006-01-12 15:17:35 +00:00
thedrunkyak
19ad5a21e8 fixed small error in last commit. 
This was SVN commit r3355.
 2006-01-12 13:50:35 +00:00
thedrunkyak
da353cb16c Cosmetic changes: 
Added areas for music, sound, ambient and voice control.
  Resolution added

This was SVN commit r3354.
 2006-01-12 13:49:30 +00:00
thedrunkyak
0dd74bb25f Added Cancel button and cosmetic changes to options menu 
This was SVN commit r3353.
 2006-01-12 10:41:45 +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
9da1e9e18b Property tree listing in manual using Philip's cunning recursion algorithm. 
This was SVN commit r3345.
 2006-01-08 23:50:11 +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
Acumen
0f2a1db46b Initial layout of F1 unit manual. 
This was SVN commit r3343.
 2006-01-08 13:39:05 +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
thedrunkyak
7720378f6c Added Mute function, fixed minor bug. 
This was SVN commit r3335.
 2006-01-07 11:42:59 +00:00
thedrunkyak
4026c15221 Changed the audio menu to allow disabling of the sound. 
This was SVN commit r3334.
 2006-01-07 10:34:06 +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