1
0
forked from 0ad/0ad
Commit Graph

337 Commits

Author SHA1 Message Date
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
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
0d11643032 Fixed a bug that was causing the original resource values to be strings instead of numbers, resulting in string concatenation when you gathered a resource.
This was SVN commit r2731.
2005-09-15 02:03:01 +00:00
58fbafbbdd Command buttons can finally invoke the building painter or train units. Still plenty of glitches (particularly click-fest issues ... still an issue when updating the buttons directly rather than via hack, so it's probably due to constant onPress refresh). I've also had to disable the progress bar until I can make it work properly, but if you can get a unit in the queue it should eventually spawn. :)
This was SVN commit r2727.
2005-09-14 22:47:51 +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
436de9b0ff Committing updated font with a bit of test text while experimenting with accented characters.
This was SVN commit r2658.
2005-09-03 21:00:43 +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
79e8f21c6f Although there's still a lot of glitches and random crashes, it should now theoretically be possible for clients to join a host's game.
Also profiles are now determined by the folders in the profiles/
directory (not that they actually do anything yet, AFAIK, but at least
the profile list isn't hardcoded).

This was SVN commit r2632.
2005-08-25 15:07:16 +00:00
c4cb65af72 Disabled Atlas Editor from main menu for the time being (it'll be accessible from shortcut).
This was SVN commit r2621.
2005-08-14 18:44:37 +00:00
72806285f8 Editor button/enable/disable click to help in experimenting with Atlas interface.
This was SVN commit r2620.
2005-08-14 16:03:44 +00:00
7a9f59c192 Improved navigation of file list by backing up particularly old and deprecated maps, and alphabetically sorted the map list.
This was SVN commit r2616.
2005-08-14 01:08:09 +00:00
43baf6ada6 New terrain properties stuff, gcc compatability and updated unix debugging stuff
This was SVN commit r2582.
2005-08-07 22:00:16 +00:00
7763ea6132 A little more client connection work.
This was SVN commit r2580.
2005-08-07 17:02:22 +00:00
76f3524190 Fixed FPS, which had stopped working (since it no longer recognised the mouse.x and mouse.y component of the string).
This was SVN commit r2579.
2005-08-07 14:51:55 +00:00
3eaad81b7a MP adjustments ... Made Session Setup a generic screen that Host, Client and Skirmish all pipe through. Moved playername into a Profile dropdown so it's not hardwired into MP. Various issues, but at least it's set the foundation for Malte's work.
This was SVN commit r2574.
2005-08-03 02:47:09 +00:00
a9397e0888 Some experiments with audio controls in the options window. (Doesn't really work yet, though.)
This was SVN commit r2571.
2005-07-31 03:08:07 +00:00
bdd5fd8578 Pilot release of yet another revision of GUI coordinates. (In other words you can shift the minimap into any corner of the screen using Alt+G.)
This was SVN commit r2570.
2005-07-31 01:15:56 +00:00
e63d314f74 More miscellaneous and largely unnoticeable GUI stuff.
This was SVN commit r2566.
2005-07-30 20:25:38 +00:00
4c7838970d Some UI changes
This was SVN commit r2561.
2005-07-28 19:57:38 +00:00
f4844681a1 Made the framework of options, history, and campaign screens, mostly just for the hell of it, and fixed various things. Can't do much with them, mind, but Rome wasn't burnt in a day (thank you, Mr Nero).
This was SVN commit r2559.
2005-07-28 02:36:48 +00:00
bb65fdc105 Added Stuart's UI changes
This was SVN commit r2557.
2005-07-27 16:45:44 +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
Gee
c6c8bdc6cd Added the <color> tag used in <setup> to setup pre-defined colors. Check docs to see how it's done.
This was SVN commit r2548.
2005-07-25 19:07:06 +00:00
Gee
cdfabb9acc Changed <icon>'s property 'texture' to 'sprite'. Better late than never.
This was SVN commit r2538.
2005-07-25 00:50:38 +00:00
Gee
26d44ba616 Changed <icon>'s property 'texture' to 'sprite'. Better late than never.
This was SVN commit r2537.
2005-07-25 00:50:17 +00:00
c6ea4f36bf Changed the file naming convention again, mainly to annoy Jason. :) (I forgot that filenames are meant to be lowercase with underscore separators.)
Experimented with Philip's view-config-variables-workaround.

This was SVN commit r2534.
2005-07-24 14:04:56 +00:00
65abb78611 main menu changes for the new dds files
This was SVN commit r2531.
2005-07-24 05:49:18 +00:00
Fire Giant
8525183732 Broke networking code. Fixed messageBox() code.
This was SVN commit r2529.
2005-07-24 01:13:50 +00:00
Fire Giant
462c85a3ba Fixed some silly variable assigment bugs. Made the game continue to work if a multiplayer host session is cancelled.
This was SVN commit r2525.
2005-07-23 23:15:58 +00:00
1de8e29c41 I've revised the example list to use Gee's revised functions.
This was SVN commit r2524.
2005-07-23 22:32:10 +00:00
Gee
4ad8de51bb Added more functions. Changed addItem to insertItem
This was SVN commit r2522.
2005-07-23 20:17:36 +00:00
b50d9f529a Some GUI fixes.
This was SVN commit r2521.
2005-07-23 14:06:38 +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
Gee
57ab45c380 Functions for lists and dropdowns.
This was SVN commit r2510.
2005-07-22 00:02:39 +00:00
Gee
02f715ea69 Renamed functions_list => functions_utility_list
This was SVN commit r2509.
2005-07-21 23:51:10 +00:00
Gee
f818449e72 Functions for lists and dropdowns.
This was SVN commit r2508.
2005-07-21 23:45:17 +00:00
Gee
7eaf8bc13c Added functions_list.jp to the list.
This was SVN commit r2507.
2005-07-21 23:44:46 +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
Gee
4e64200131 This was SVN commit r2501. 2005-07-20 23:47:46 +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
Fire Giant
81bdf6e1c4 Fixed the join dialog window. Establishing connection now works, but is currently not reported by anything but the console.
This was SVN commit r2494.
2005-07-20 02:56:32 +00:00
e7946ad774 functions_pregame_load.js: fixed whitespace
new OpenAL version.

This was SVN commit r2489.
2005-07-20 00:51:38 +00:00
9b4de9a016 Quick JS fixes.
This was SVN commit r2480.
2005-07-12 00:06:31 +00:00
a96fd84391 The game loading was broken, and I fixed it! Wahooo, my first venture into the world of GUI scripting.
This was SVN commit r2479.
2005-07-11 04:52:20 +00:00
0342f01580 Revised structure of mainmenu script (better property visibility, more use of styles, removal of redundant default properties).
This was SVN commit r2478.
2005-07-11 01:29:14 +00:00
Fire Giant
ad182999eb Reinitialised the pregame multiplayer GUI, made it work and break. Commiting to keep the file in sync.
This was SVN commit r2477.
2005-07-10 02:26:08 +00:00
1975a047c5 removed hard-coded constants to use the ones registered by the engine... pending a complete revamp that doesnt use SDL constants (yech!) all
This was SVN commit r2413.
2005-06-20 15:17:48 +00:00
0331883a86 Temporary fix for mouse input. Improved performance in player-colour model renderer. Also improved performance in lighting, at least in unoptimised builds.
This was SVN commit r2328.
2005-05-20 17:09:47 +00:00
c8b851eda9 - JS functions to make use of new ordering and interaction APIs
- selectLocation and selectEntity using the new interaction API
- Implemented attack and patrol buttons using select{Location,Entity}

This was SVN commit r2317.
2005-05-18 05:35:25 +00:00
MarkT
86dc351205 Projectile code and updates to some actors that can use it (celt_ijv and hele_iar)
This was SVN commit r2266.
2005-05-10 07:13:25 +00:00
8683e6a3ec fix music title (avoids one particular warning at exit)
This was SVN commit r2258.
2005-05-09 04:32:06 +00:00
69a96c6b1e Vague attempt at error-checking in some JS code
This was SVN commit r2256.
2005-05-09 04:03:26 +00:00
b75c3607b4 Quick demonstration of Jan's nifty VFS functions in action.
This was SVN commit r2245.
2005-05-05 02:51:39 +00:00
d2410624e4 This was SVN commit r2217. 2005-05-03 01:57:03 +00:00
158f967926 Quickly unbreak the broken bits before anyone notices.
This was SVN commit r2216.
2005-05-03 00:02:37 +00:00
cab424ce81 Creating playlist sub-window to soon try out file access functions. (Committing in-development stuff to get an auto-build incorporating change to GUI .xml names.)
This was SVN commit r2214.
2005-05-02 22:04:29 +00:00