Commit Graph

949 Commits

Author SHA1 Message Date
c802dc3152 * Fixed minor glitch which was causing the garrison icon to not appear. (Temporarily moved garrison value into command cell sheet, then changed mind and swapped it back to having its own sheet, since it'd probably need to be coloured to match the nearby supply icon.)
This was SVN commit r3673.
2006-03-22 18:21:27 +00:00
8dd3a61a3a * Took Philip's advice and made all local GUI variables actually local using var.
* Added a simple "Game is Paused" text message to the Pause hotkey.

This was SVN commit r3672.
2006-03-21 22:30:29 +00:00
ccc8055226 Fail more nicely with invalid actors
This was SVN commit r3669.
2006-03-19 22:37:56 +00:00
c29f4ca444 Minor alignment correction.
This was SVN commit r3668.
2006-03-19 06:38:24 +00:00
be382223f8 fixing the glossy buttons
This was SVN commit r3667.
2006-03-19 02:34:02 +00:00
28c6bc2fbb * Minimap buttons are in place and clickable (though not actually hooked up with any events yet). The arc buttons still don't look quite right, but artist intervention will no doubt set me right.
This was SVN commit r3663.
2006-03-18 17:42:37 +00:00
8315bcce96 * Fixed invalid name bug that slipped in when I did a blind commit. (Minimap buttons aren't positioned right, but at least I've got some of them up.)
* Split command backs into outer ring and inner bubble (so nested
add_color can be used to illuminate only the interior).
* Used nested add_color (when you have a new toy, you have to play with
it) to make only the icon of a tab illuminate, which looks a lot better.
* Removed garrison sprite definition, since that cell sheet is not long
for this world.

This was SVN commit r3662.
2006-03-18 06:58:16 +00:00
7fc3d5cfac This was SVN commit r3661. 2006-03-18 05:49:56 +00:00
b0d1110f52 Reduced length of some of the player names, since they were longer than the GUI pane where they're displayed. (And thanks for the XML, Philip.)
This was SVN commit r3660.
2006-03-18 05:31:35 +00:00
c2f13c689e Load default player data from XML
This was SVN commit r3658.
2006-03-18 04:38:41 +00:00
6f506dcc33 * UI tweaks, fixes, updates for the affected files.
* New horizontal tab

This was SVN commit r3655.
2006-03-17 10:52:00 +00:00
3f95dcb6ba Idle and Flare buttons on the MiniMap (though I'm currently not sure why they're unclickable).
Started on the surrounding buttons, but unsure if they work or not since
the engine is now crashing for me after archive. :( (Modifying a data
file while the game is running also causes the game to crash.)
Committing some changes anyway.

This was SVN commit r3650.
2006-03-16 17:38:55 +00:00
f32388742b * New command icons because the old ones were ugly (tried out the new abrg dds convert - works nicely and looks better with these monochromatic gradients)
* Experimented with rollovers for the command icons

This was SVN commit r3649.
2006-03-16 11:29:50 +00:00
72af90ea14 This was SVN commit r3645. 2006-03-16 04:00:42 +00:00
26dc8cc4c8 - tex_dds: fix comment; enable warning on unsupported formats
- renderer: avoid particle-emitter memory leak warnings

This was SVN commit r3639.
2006-03-15 18:32:24 +00:00
8438a45948 * fixed the stat icons (resizing 64x64 textures down to 16x16 isn't as pretty as the real 16x16 texture)
* made the menu icons
* tweaked the tech icon

This was SVN commit r3638.
2006-03-15 11:59:32 +00:00
d2c9a02df2 This was SVN commit r3637. 2006-03-15 09:10:02 +00:00
55f91550b5 * CSV-based icon sheet definitions. (Mmm, data-driven methodology ...)
* First wave of minimap changes (still need to do all the buttons).
* Removed deprecated UI art.

This was SVN commit r3633.
2006-03-14 23:01:55 +00:00
ed38414b41 Texture converter, DevIL: ABGR DDS support.
Textures: converted ARGB to ABGR.
Misc: warning fixes, etc.

This was SVN commit r3631.
2006-03-14 21:29:19 +00:00
1c1bfcbb53 fixed orientation of minimap pane
This was SVN commit r3630.
2006-03-14 20:14:34 +00:00
fd65ae8415 Minimap side of the session - background with some buttons and icons
This was SVN commit r3629.
2006-03-14 10:58:50 +00:00
e1d5b241f2 New 'validProperty (propertyString)' function takes care of checking the validity of each subelement in an entity property. (Reduces all that 'if (a && a.b && a.b.c && a.b.c.d)' malarky to 'if (validProperty ("a.b.c.d"))'.)
This was SVN commit r3626.
2006-03-13 20:58:21 +00:00
2c405028f4 * Increased Optimus font to 14b.
* Got selection healthbars into correct position.
* Implemented statistic icons. (todo: tooltips)
* Enabled pick lists (had to resort to brute-force
check-every-subsection-of-an-entity-property-whenever-I-use-it method).

This was SVN commit r3621.
2006-03-10 21:23:39 +00:00
0defe7a347 New command icons
Updated the rank icons
darkened 3 of the civ status images to help with readability

This was SVN commit r3620.
2006-03-10 12:57:05 +00:00
3a35ea935c * Revised and hopefully ultimate resource counters. I have to admit they look pretty damn good to me.
This was SVN commit r3619.
2006-03-09 22:17:04 +00:00
ab58cab488 * Status-Pane-integrated civ information.
This was SVN commit r3617.
2006-03-09 16:49:26 +00:00
23409df58c * Icon reshuffling.
This was SVN commit r3616.
2006-03-09 16:46:02 +00:00
5aed6a1ef6 This was SVN commit r3615. 2006-03-09 16:43:09 +00:00
3f98bdc76d UI goodies - new status pane, civ overlays for the status pane, new resource icon background stuff, fixed the stat icons as requested
This was SVN commit r3614.
2006-03-09 11:25:57 +00:00
78710b8ff1 * Adjusted position of buttons so they arc the Status Pane.
* Started work on health bars below selection/garrison row (hidden for
now, as it's buggy).
* Implemented Jason's civ emblem icons.

This was SVN commit r3613.
2006-03-08 19:13:56 +00:00
efffb34f4a New statistic icons, merged the armour and attack sheets into the blanks of the statistic sheet.
This was SVN commit r3612.
2006-03-08 11:51:34 +00:00
b48dc75fe8 Here are some civ icons
This was SVN commit r3611.
2006-03-08 07:32:39 +00:00
4b3997f1f6 update for small entity icons
This was SVN commit r3604.
2006-03-04 21:27:31 +00:00
780e441117 Moved some icon locations.
This was SVN commit r3600.
2006-03-04 18:28:52 +00:00
6e35ac1554 This was SVN commit r3599. 2006-03-04 18:28:13 +00:00
8d3222f9e2 Missing Optimus Princeps font.
This was SVN commit r3598.
2006-03-04 18:00:31 +00:00
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
c0875f6d95 This was SVN commit r3596. 2006-03-04 17:55:25 +00:00
a793889a8b UI overlay portraits
This was SVN commit r3595.
2006-03-04 12:48:24 +00:00
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
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
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
7fe7ddb6a1 yay, nice looking images - no lossless issues
This was SVN commit r3584.
2006-03-02 11:11:22 +00:00
03da3b23a1 hook up to builder; call archiveBuilderCancel
This was SVN commit r3577.
2006-03-01 22:17:02 +00:00
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
65ddbcf2f9 new backgrounds
This was SVN commit r3575.
2006-03-01 09:23:44 +00:00
33c2877065 Jason's new Status Pane backdrop.
This was SVN commit r3574.
2006-02-28 18:27:38 +00:00
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
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
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
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
c55b49164a Tweaked foundations' LOS so it depends on their sizes.
This was SVN commit r3567.
2006-02-26 22:25:17 +00:00
2e26b5e1da Added foundations for all the building types.
This was SVN commit r3566.
2006-02-26 22:10:01 +00:00
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
2aebdd1894 another update
This was SVN commit r3561.
2006-02-25 12:54:11 +00:00
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
ffcd73ad96 played around with the icons a bit more
This was SVN commit r3559.
2006-02-24 10:50:38 +00:00
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
e959e59614 icon demos
This was SVN commit r3555.
2006-02-23 12:01:37 +00:00
a52365f90a ranked stuff
This was SVN commit r3552.
2006-02-23 07:07:58 +00:00
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
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
022c84f43d formation test1
This was SVN commit r3546.
2006-02-22 07:25:30 +00:00
acbed7a656 Vercingetorix, our first Celtic hero (minus his horse)
This was SVN commit r3545.
2006-02-21 10:56:02 +00:00
a40b3d38ae Mythos' lighting tweak.
This was SVN commit r3544.
2006-02-21 03:57:10 +00:00
e0fe2b7253 This was SVN commit r3538. 2006-02-19 02:42:52 +00:00
008d487d2c This was SVN commit r3537. 2006-02-19 02:40:40 +00:00
6d0a9c6d04 This was SVN commit r3536. 2006-02-19 02:39:49 +00:00
7396587f6e Fix scenario DTD
This was SVN commit r3517.
2006-02-15 05:49:14 +00:00
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
e3c3ac920f lighter shadows for cantabrian_generated.xml
This was SVN commit r3510.
2006-02-14 05:20:17 +00:00
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
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
56d8d31cd0 This was SVN commit r3485. 2006-02-08 07:26:32 +00:00
51cbee9f39 Gave the fauna horse random textures
This was SVN commit r3484.
2006-02-08 02:25:30 +00:00
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
3e2017147d Snazzier resizing resource counters and some miscellaneous fixes.
This was SVN commit r3460.
2006-02-03 03:15:49 +00:00
22be4ee0d6 temp ships with props
This was SVN commit r3455.
2006-02-01 10:53:10 +00:00
efc45aac23 This was SVN commit r3453. 2006-02-01 00:58:17 +00:00
79767e2e1b This was SVN commit r3452. 2006-02-01 00:57:44 +00:00
f5dec3e4ab This was SVN commit r3451. 2006-02-01 00:57:19 +00:00
Aeros
6699dc11c7 This was SVN commit r3435. 2006-01-29 03:59:32 +00:00
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
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
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
1c541db46b Health regen fix for ranged attack.
This was SVN commit r3410.
2006-01-23 03:55:35 +00:00
cdd432ba46 updating the tips file to some latin
This was SVN commit r3409.
2006-01-23 03:38:45 +00:00
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
199550457d to entities that I'm adding to fix errors
This was SVN commit r3407.
2006-01-23 02:34:38 +00:00
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
c3b289ec0b new demetrius entity to test animations
This was SVN commit r3392.
2006-01-22 06:39:55 +00:00
5c5c6cd469 New actors to play with new animations
This was SVN commit r3391.
2006-01-22 06:37:51 +00:00
b32a8361e5 AI stance properties and extended animal templates.
This was SVN commit r3390.
2006-01-22 05:28:41 +00:00
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
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