Commit Graph

51 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
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
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
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
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
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
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
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
33c2877065 Jason's new Status Pane backdrop.
This was SVN commit r3574.
2006-02-28 18:27:38 +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
3e2017147d Snazzier resizing resource counters and some miscellaneous fixes.
This was SVN commit r3460.
2006-02-03 03:15:49 +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
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
a88915825f Various GUI fixes (and probably some breakages ;D).
This was SVN commit r2768.
2005-09-26 23:08:06 +00:00
bc3949db1a Added a fairly primitive water plane. This includes several things:
- Hotkeys Q, A, Z to toggle, raise and lower the water plane
respectively.
- A unit trait, named anchor, that says whether it attaches to the
terrain or the water.
- Small changes to rendering code.

This was SVN commit r2744.
2005-09-18 03:16:12 +00:00
4ab25c7274 * Fixed the "can't interact with the world" glitch. Turns out it was my fault. :)
* Restored the resource pool (and cleaned up the JS interface to it ...
array and counters are updated in one spot (wrapper functions to
add/deduct/define), without need for constant refresh).
* Added crude boxes in game setup to enter initial resource value.
* The command buttons still don't work when clicked (and clicking
continues to be erratic, only triggering if hammering the mouse button
... I think it's related to the return function() hack Philip set up),
but that's next on the list. :)
* Oh, and the command buttons don't currently realign to the different
corners with Alt+G, but all the rest should.

This was SVN commit r2715.
2005-09-14 00:50:25 +00:00
d3f41e1b9f Finally put the command buttons back in, but the GUI doesn't seem to be accessible when a unit is clicked, so I can't be sure it works. I think it may be due to no left-click options in Simon's world click event handler. Need to ask him about it.
Also it's much slower as the buttons are constantly updated ... Mark's
shouldUpdateStat() doesn't seem to be registering in this case. Need to
check with him about that too.

This was SVN commit r2697.
2005-09-10 17:30:57 +00:00
84a980a344 Reimplemented session GUI refresh loop, with unit portrait as test subject. Fixed some broken things.
This was SVN commit r2666.
2005-09-05 03:21:20 +00:00
3c58f50ff3 GUI-toggle feature for Michael (toggle with the G key), and fixed alignment of watermark.
This was SVN commit r2634.
2005-08-26 21:02:00 +00:00
e63d314f74 More miscellaneous and largely unnoticeable GUI stuff.
This was SVN commit r2566.
2005-07-30 20:25:38 +00:00
1ed994c819 Undeleted GUI folder, added Stuart's changes.
This was SVN commit r2552.
2005-07-27 15:21:27 +00:00
Fire Giant
d789b86b37 Deleted the GUI folders for Stuart on his request in order to allow him to commit his new code to a clean base.
This was SVN commit r2551.
2005-07-27 00:47:08 +00:00
4655a6ded3 Renamed the GUI object functions (probably missed a few calls), and made first attempt at list control for SP (warning: a lot of maps are too outdated to run, so choose with caution).
This was SVN commit r2518.
2005-07-23 02:02:45 +00:00
9b2736e1d1 Removed absolute properties, since they're now used by default. Hurrah!
This was SVN commit r2504.
2005-07-21 03:01:58 +00:00
eed104e139 Made objects relative by default, cutting down on some redundant properties. Cleaned up loading screen script.
This was SVN commit r2500.
2005-07-20 23:00:48 +00:00
158f967926 Quickly unbreak the broken bits before anyone notices.
This was SVN commit r2216.
2005-05-03 00:02:37 +00:00
3d59ecab85 Train lists now support a basic progress bar and unit counters. Still to come ... Removing entries from the queue by right-clicking buttons, prerequisites and resource costs.
This was SVN commit r2147.
2005-04-19 02:06:18 +00:00
a3cb8a322c Little more experimenting with unit training.
This was SVN commit r2140.
2005-04-16 05:45:28 +00:00
d983be8fdc Updated command buttons. Still need to adjust alignment of buttons past a certain width so they occupy a column to the right of the Status Pane, and create functionality for clicking other than toggling tabs.
This was SVN commit r2119.
2005-04-09 07:46:22 +00:00
0eb78450c0 Maybe fixed GUI event-handler function things. Other minor changes and fixes.
This was SVN commit r2096.
2005-03-30 22:33:10 +00:00
8d6ebe1b1f Made a start on making the team tray and group pane buttons functional. Removed the silly text from the loading screen now that we do indeed have a functioning progress bar. Refined structure for resource pool functions. Fixed up little things here and there.
This was SVN commit r2082.
2005-03-30 02:01:22 +00:00
0d6035ea68 Committing revised "game session" GUI coordinates (sorry, doesn't make much cosmetic difference, but it's an improvement on the code side). The command buttons and build lists still need to be revised (hence they're upside down -- the coordinate system has flipped), so please note that's a known problem.
This was SVN commit r1966.
2005-03-07 18:25:13 +00:00
59227899dc Initial work on GUI coordinate revision (implemented for Manual and Editor, anyway), though Editor currently has a strange infinite loop on startup I'm too tired to squash right now. Broke Editor script so game'll work in the meantime; will fix ASAP.
This was SVN commit r1834.
2005-01-27 11:33:27 +00:00
ebfa5f8d24 Changed resources over to a player object and did some reorganisation of the session start/end code.
This was SVN commit r1763.
2005-01-23 11:50:51 +00:00
f9c51d8ec7 Replaced - with _ in GUI
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
c97077f971 Itsy bitsy Editor adjustments.
This was SVN commit r1586.
2004-12-28 12:55:49 +00:00
0382cdd9b1 More tooltip updates. Made the main menu buttons and the in-game resource counters use them.
Fixed space/tab inconsistencies in (though not between) GUI XML files.

This was SVN commit r1554.
2004-12-23 13:56:34 +00:00
7cfa5f6e4d More GUI texture cleanup. :)
This was SVN commit r1528.
2004-12-18 16:27:32 +00:00
323ca1746f Big GUI update to kinda-sorta-maybe put lots of previously individual GUI art into cellular sheets. Still needs some work.
This was SVN commit r1523.
2004-12-18 02:42:22 +00:00
4815f76c5f Various GUI fixes to get the scripts in line with Mark's revised data types (much appreciated!).
This was SVN commit r1516.
2004-12-16 19:21:05 +00:00
7346e39cc4 Revised Status Pane icons so they're split into separate components, which seems to make them display properly (nested commands like [icon=] apparently don't interpret correctly if appending to one of their strings).
This was SVN commit r1508.
2004-12-15 21:59:17 +00:00
cb5759c737 Fixed minor icon glitch. Recompiled. (Quick commit before I try something more drastic.)
This was SVN commit r1506.
2004-12-15 19:20:29 +00:00
b04b3447c8 For reasons I cannot fathom at this late hour, a section of objects in 2_mainmenu.xml causes the coordinates of the session GUI to be screwed up. After a couple of hours of lack of success, commented it out so it'll work until tomorrow. Gotta get some sleep before work.
This was SVN commit r1498.
2004-12-13 23:15:11 +00:00
01443e4785 Fixed 0 A.D.-style windows from yesterday to use sprite collages. Made another one as background to future hosting screen.
This was SVN commit r1496.
2004-12-13 21:37:30 +00:00
114f3f1513 Finished off first draft of in-game menu (ie made it actually do something useful). Hit F10 or click corner Map Orb buttons at random until you find it, as I'm too tired to mock up a replacement button image. ;)
This was SVN commit r1493.
2004-12-13 01:14:31 +00:00