1
0
forked from 0ad/0ad
Commit Graph

296 Commits

Author SHA1 Message Date
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
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
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
b48dc75fe8 Here are some civ icons
This was SVN commit r3611.
2006-03-08 07:32:39 +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
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
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
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
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
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
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
3e2017147d Snazzier resizing resource counters and some miscellaneous fixes.
This was SVN commit r3460.
2006-02-03 03:15:49 +00:00
cdd432ba46 updating the tips file to some latin
This was SVN commit r3409.
2006-01-23 03:38:45 +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
pyrolink
01ff2fdf3b Secondary order script support; run order addition
This was SVN commit r3362.
2006-01-16 10:55:01 +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
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
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
9a7fb2d090 A few more manual fixes.
This was SVN commit r3348.
2006-01-09 15:58:42 +00:00
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
0f2a1db46b Initial layout of F1 unit manual.
This was SVN commit r3343.
2006-01-08 13:39:05 +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
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
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
a40ee4bcbc Fixed the button flickering bug. It turns out that guiHide/guiUnHide were settings controls to hidden/unhidden each tick, which caused the C++ code to reset mouse interaction properties even if the thing went from unhidden to unhidden. I fixed it by making guiHide and guiUnHide check whether the control is already hidden/unhidden before changing it, though maybe we want different behaviour from the C++ code.
This was SVN commit r3262.
2005-12-17 00:24:43 +00:00
7af724889c Updated unit training to work with the new entities.
This was SVN commit r3261.
2005-12-16 22:52:10 +00:00
2d969da879 Removed some debug messages.
This was SVN commit r3257.
2005-12-16 07:19:47 +00:00
59eadae140 Fixed build buttons for new entities.Fixed command buttons for the new entities. Also fixed a bug where build buttons disappeared after you clicked a unit that couldn't build anything (there was a missing guiUnHide) and added infidelity aura to herdable animals.
This was SVN commit r3255.
2005-12-16 07:12:19 +00:00
b14dc940ef New entities and associated changes to scripts.
This was SVN commit r3248.
2005-12-15 21:55:18 +00:00
213463fdfd update JS code to use new fade code. fix some indentation.
This was SVN commit r3242.
2005-12-13 23:19:15 +00:00
c38352703e Greek horse cavalry stuff
This was SVN commit r3132.
2005-11-13 11:38:29 +00:00
416c7fe4ba Get rid of errors (selection can have size 0).
This was SVN commit r3061.
2005-10-30 21:09:27 +00:00
5582e4b890 Added resetUpdateVars(), so that selection/property update handler is actually refreshed and so improves performance like it's meant to. ;) Thanks for spotting that, Philip.
This was SVN commit r3053.
2005-10-30 01:06:04 +00:00
11d6b08360 GUI updates converting from .png to .dds
This was SVN commit r3010.
2005-10-25 01:29:42 +00:00
Fire Giant
e049e0a60d Fixed positioning of new LOS control (TODO: split into FoW and Reveal check boxes)
This was SVN commit r2938.
2005-10-14 02:06:51 +00:00
Fire Giant
39dbc65a19 Updated session setup screen and some minor changes in shell GUI layout.
This was SVN commit r2937.
2005-10-13 20:04:22 +00:00
e294e30c51 Added LOS setting to game setup screen.
This was SVN commit r2886.
2005-10-10 03:34:45 +00:00