1
0
forked from 0ad/0ad
Commit Graph

317 Commits

Author SHA1 Message Date
pyrolink
a95c72d0c1 Upgraded console (text wrap, help text), cinematic stuff
This was SVN commit r4065.
2006-07-06 03:17:44 +00:00
536d6f4cd3 # bugfix (main menu music fading)
fixes #123

This was SVN commit r4012.
2006-06-22 19:13:25 +00:00
92b9c07f95 Restoring SVN repository:
Greek basket texture

# New Greek vases

# housekeeping
documentation fix: trailing / in directory names is mandatory

# Atlas: Sky texture selection; save with maps

Atlas code tidying: Slightly nicer syntax for defining command handlers,
and some explanation of how it works

Automated build.

This was SVN commit r4008.
2006-06-21 22:37:31 +00:00
77c59070c1 # Various gameplay updates.
- Added per-player resource pool and modified the GUI and entity scripts
to work with it.
- Modified unit creation functions so the unit is always assigned a
player before firing its initialize event, so that this event can deduct
population, etc from the right player.
- Fixed various small bugs, like a unit not cancelling all of its queued
items when it dies, or buildings not costing anything.

This was SVN commit r3998.
2006-06-10 03:05:16 +00:00
e02d42b746 # Loading screen now uses dynamic textures for random backgrounds.
Thanks, Philip. (y)

This was SVN commit r3891.
2006-05-25 03:05:06 +00:00
08ec780f17 Enable main menu music.
This was SVN commit r3852.
2006-05-05 17:01:02 +00:00
b512733787 # Completed the new unit production system and tied it in with the GUI.
This was SVN commit r3831.
2006-04-30 20:34:39 +00:00
pyrolink
c38a5379f6 This was SVN commit r3733. 2006-04-08 22:35:23 +00:00
ef155571c0 # As requested by Jason, now only one tab list in the Status Pane will be open at any time (hovering one will close any others that are open).
(Probably. I couldn't test with units due to the ModelRenderer
javelinist crash, but it seems to have the desired effect for the Civ
Centre. Which isn't the most conclusive test since the research list is
empty anyway.)

# Implemented Andrew's formation functions in the formation "pick list".

(Again, probably. Since this is completely untestable without being able
to select units, I can only speculate that it might work. The game
didn't crash and burn on startup as a result of my meddling, which I
take as a good sign.)

(Andrew: The changed section is a formation case switch at line 376 of
functions_page_session_status_commands.js. I endeavoured to use all your
functions to try them out. Like I said, I'm not sure if any of this
works -- and being sick and feverish doesn't help -- but it might at
least give you somewhere to start.)

This was SVN commit r3723.
2006-04-03 04:54:43 +00:00
pyrolink
cf14a7bc15 -rank/formation stuff and fixes. To give a unit a rank texture, just set rank.name in the entity's XML to the filename of the texture e.g. elite.dds or advanced.dds
This was SVN commit r3711.
2006-03-31 03:37:36 +00:00
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
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
c29f4ca444 Minor alignment correction.
This was SVN commit r3668.
2006-03-19 06:38:24 +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
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
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
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