Commit Graph

904 Commits

Author SHA1 Message Date
34ff09529d # Implemented "pick list" selection code in UI. (Stances and formations can now be selected.)
# Added Explore tag for infantry units.
# Temporarily assigned a standard set of formations to all units for
testing purposes.
# Fixed pick list tab style.
* (Also updated traits.formation in Wiki to keep in sync.)
* Added "loose" formation -- is there a better name for that? -- since
presumably we'll need an option to disband the current formation.
* Pushed selection tab behind the pane as an easy alternative to
shifting it about.
* Started working on lists with "mixed" items (from different sheets,
like Allegiances), but decided halfway to commit the formation stuff for
Andrew.
* (Incidentally, as suspected, there isn't enough room for all these
items. All four horizontal tabs are now maxed out on a typical CS. Might
have to append the kill and player tribute items from Allegiance onto
Stance.)
* (Also, if we need more than 11 items in the list, that will also need
to be adapted sooner rather than later. The representative formation
list is maxed out.)

This was SVN commit r3680.
2006-03-24 20:59:09 +00:00
e72adfff5c # Two new updated animations for the chop and the mine actions. Updated test actor accordingly.
This was SVN commit r3679.
2006-03-24 12:11:46 +00:00
ad8c29a8c7 Just a test map to see how close I can get to an actual Mediterranean biomic map given our current art assets. It is currently unfinished, but will continuously update.
This was SVN commit r3678.
2006-03-24 05:24:46 +00:00
3efeeecb84 # Made two new animation files (gather, hoe) for testing animations. Also modified the hele_inf_jav_b to use the new actor format for testing purposes.
This was SVN commit r3675.
2006-03-23 10:50:45 +00:00
792c479165 * Fixed bug in command lists that was causing the first item in a production list to not be displayed.
* Got selection list (shows a list of portraits of the currently
selected units, with health bars) to work, including horizontally
expanding tab (using a helmet tab temporarily to get an idea of the icon
location).
* Todo: Dynamically adjust tab position when horizontal list (tabs need
more blending room); bleed portraits into additional rows above when the
number of entities in the selection exceeds the length of a list.

This was SVN commit r3674.
2006-03-23 07:45:52 +00:00
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