1
0
forked from 0ad/0ad
Commit Graph

329 Commits

Author SHA1 Message Date
bdc0073b16 Added product/company watermark to aid in taking official screenshots. Press W to toggle it.
This was SVN commit r1613.
2005-01-02 19:25:22 +00:00
a8b7c8c0cf A little more GUI stuff.
This was SVN commit r1610.
2005-01-01 19:20:42 +00:00
daebe3fec1 Editor menu bar (though no actual menu yet :p)
This was SVN commit r1607.
2005-01-01 16:53:14 +00:00
8e071ef602 Revised coordinate system for Editor, after advice from Philip. Much more flexible, less lines of code.
This was SVN commit r1606.
2005-01-01 15:30:56 +00:00
f9c51d8ec7 Replaced - with _ in GUI
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
1c2acfed8c CInput textcolor
This was SVN commit r1602.
2004-12-31 12:20:22 +00:00
e72addb945 Editor: Finished collapsible toolbar at the top. Next task: menu bar.
This was SVN commit r1597.
2004-12-29 21:20:42 +00:00
8ebc09b336 More Editor stuff, mainly more work on the toolbar.
This was SVN commit r1591.
2004-12-28 22:16:32 +00:00
c97077f971 Itsy bitsy Editor adjustments.
This was SVN commit r1586.
2004-12-28 12:55:49 +00:00
7c390625c9 This was SVN commit r1582. 2004-12-28 03:53:52 +00:00
7ce95fdaa4 Modest additions to the in-game editor GUI layout.
This was SVN commit r1581.
2004-12-28 01:58:28 +00:00
6ed9263ee1 Added 'var' to JS variable declarations. Fixes a fatal crash when code that alters the variable 'GUIObject' dies rather than returning successfully, since 'GUIObject' is a class name.
This was SVN commit r1564.
2004-12-23 22:13:59 +00:00
c21bfde045 Clipped empty space from the new textures after hearing from Philip that they don't have to be of equal height and width. :)
This was SVN commit r1563.
2004-12-23 21:39:40 +00:00
1c89ab78f0 Packing it in for tonight.
This was SVN commit r1562.
2004-12-23 21:21:02 +00:00
3801b4b52f Established Editor framework (theoretically).
This was SVN commit r1560.
2004-12-23 18:43:43 +00:00
5ac6555b9b Added sprites that will potentially be used for the Editor when I get around to it.
This was SVN commit r1557.
2004-12-23 18:01:55 +00:00
47842863c4 Initial IP Hosting and map selection screens from Malte. Committed on his behalf as he's having problems with his authorisation.
This was SVN commit r1555.
2004-12-23 17:22:22 +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
16e5b8f94b Quickly added an Editor button.
This was SVN commit r1541.
2004-12-21 17:54:33 +00:00
659a9ea57a Initial (incomplete) tooltip code
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
6486de894d Eliminated grayscale images.
This was SVN commit r1539.
2004-12-20 19:33:09 +00:00
849f50a500 Grayscale effects for GUI sprites
This was SVN commit r1536.
2004-12-19 12:20:04 +00:00
76c67f029d Made loading screen appear, now that Simon's fix has enabled the scheduler before the session. This one is just static ... We'd need to break loadSession() up into fragments and call each in turn in order to have a loading bar, as far as I can tell. (Also, any way to disable the cursor&input from JS?)
This was SVN commit r1535.
2004-12-19 10:53:40 +00:00
92e7394c7b Eradicated lit sprites thanks to sprite effects from Philip. :D
This was SVN commit r1530.
2004-12-18 18:48:37 +00:00
99a022f847 Even more GUI cleanup.
This was SVN commit r1529.
2004-12-18 17:05:22 +00:00
7cfa5f6e4d More GUI texture cleanup. :)
This was SVN commit r1528.
2004-12-18 16:27:32 +00:00
ba0ebd6644 Renamed icon-size/icon-id to cell-size/cell-id, and allowed cell-id to be used in <icon>s.
Added <effect>s to sprites/images - currently multiply-color and
add-color, though they're far from perfect.

This was SVN commit r1525.
2004-12-18 13:32:00 +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
cd35701f70 Updated GUI/entities to use Philip's spiffy new icon sheets. :)
This was SVN commit r1520.
2004-12-17 17:22:27 +00:00
6526301cfe GUI icon-sheets
This was SVN commit r1519.
2004-12-17 16:20:08 +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
07ebaf86c5 Quick fix for icons that weren't being refreshed (a couple remain, but I think those are due to a temporary datatype mismatch).
This was SVN commit r1509.
2004-12-15 22:32:59 +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
7d76ef980a Fixed GUI error from yesterday. Still can't figure out why it's fixed, but hey, it works. All yours now, Malte. (y)
This was SVN commit r1499.
2004-12-14 17:23:10 +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
6194fdb400 Added MP button (though it needs artistic intervention (ie Malte) to do the white highlights and get it positioned just right).
This was SVN commit r1495.
2004-12-13 19:14:37 +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
24abb51b59 First crack at loading screen (though need to figure out a way to move session loading to next frame to get it to actually stay on the screen). Some preliminary work on sub-windows.
This was SVN commit r1489.
2004-12-12 19:34:38 +00:00
7e7743a90d Implemented population of command buttons.
This was SVN commit r1461.
2004-12-06 00:54:06 +00:00
0d270c968c More GUI stuff, primarily to start implementing entity lists.
This was SVN commit r1451.
2004-12-05 03:37:01 +00:00
944397c4cf (Trying again, as it timed out last time I tried this.) Added various entity attributes, and struggled to get them to appear in GUI (seem to be issues with numeric interpretation and icons sometimes don't appear), but it's a start. Also made start on training
This was SVN commit r1450.
2004-12-04 21:38:52 +00:00
0c0d20d3eb Marginally improved game performance by reducing session GUI updates (now waits over a second before updating the controls, but at least the frame rate is better). Also turned off GUI refresh when in full-screen mode (Alt+G).
This was SVN commit r1448.
2004-12-02 23:38:51 +00:00
a2bcfd8a47 Minor GUI fixes.
This was SVN commit r1422.
2004-11-28 21:11:37 +00:00
ec62c14ca4 Created entities for all Hellenic buildings created so far.
This was SVN commit r1421.
2004-11-28 20:11:02 +00:00
ee669ca572 More of the same.
This was SVN commit r1420.
2004-11-28 19:10:26 +00:00
068f6e8d47 Revised GUI scripts to turn Status Orb into lengthened pane, populated it with stats, retabulated Group Pane and gave it an opaque background (as requested by Malte).
This was SVN commit r1411.
2004-11-27 22:17:35 +00:00
314689a0bf Last-minute GUI fixes to make music cross-fade when switching between tracks. Also made it switch back to the main theme on End Game.
This was SVN commit r1396.
2004-11-25 02:44:38 +00:00
fde2cae72e Minor fix for music.
This was SVN commit r1379.
2004-11-22 23:41:44 +00:00
b99699cacc Support for grunts and cries of pain when units attack.
This was SVN commit r1370.
2004-11-21 01:19:32 +00:00
Fire Giant
dfec360d84 Minor tweakings regarding multi-lined code for message boxes.
This was SVN commit r1369.
2004-11-20 23:19:59 +00:00
Fire Giant
82fe6b675a Added a temporary "End Game" button with adequate message box as Jason requested. This will get replaced by a real game menu soon.
This was SVN commit r1368.
2004-11-20 23:19:24 +00:00
f92c0a6d1f More GUI.
This was SVN commit r1367.
2004-11-20 21:52:41 +00:00
2b5b46c5c8 Added pseudo-random music playback.
This was SVN commit r1365.
2004-11-20 17:52:18 +00:00
25468f0251 Want some more GUI? Here ya go.
This was SVN commit r1356.
2004-11-19 02:06:32 +00:00
Fire Giant
88af47ce03 Changed the 0ad icon code.
This was SVN commit r1355.
2004-11-18 21:50:17 +00:00
839c2033ec But wait, more GUI.
This was SVN commit r1354.
2004-11-18 21:27:23 +00:00
59629dfe9d More GUI.
This was SVN commit r1349.
2004-11-18 15:43:34 +00:00
1448568308 More GUI updates.
This was SVN commit r1348.
2004-11-18 05:27:12 +00:00
ee6ae42c5f Commit to remove duplicate 0ad icon.
This was SVN commit r1347.
2004-11-18 02:36:20 +00:00
Fire Giant
f39d503395 Small updates, disabled music-command on exit button, since that didn't seem to work for me (button ceased to work).
This was SVN commit r1346.
2004-11-18 01:47:10 +00:00
Fire Giant
2d1079daa8 New fonts for message box (larger/better readability) plus icon implementation.
This was SVN commit r1345.
2004-11-17 23:46:29 +00:00
MarkT
884428f8a7 Testing an update to this file.
This was SVN commit r1344.
2004-11-17 23:38:46 +00:00
f5723ecefe Update for entity promotions.
This was SVN commit r1342.
2004-11-17 06:25:30 +00:00
419a1e0a7d Various GUI updates.
This was SVN commit r1340.
2004-11-16 21:14:26 +00:00
Fire Giant
0b53acf968 Inserted 0ad icon for messages / ingame text.
This was SVN commit r1337.
2004-11-16 02:29:24 +00:00
Fire Giant
93706e81c3 Improved message box (3 buttons/icon support).
This was SVN commit r1336.
2004-11-16 02:28:19 +00:00
b5655265da GUI update (first music implementation, a little Status Orb improvement).
This was SVN commit r1335.
2004-11-16 00:44:10 +00:00
b727fbfa15 Resource Pool update.
This was SVN commit r1330.
2004-11-15 21:07:02 +00:00
751cf46d2e Updated GUI to revise Group Pane and do some other cleanup stuff.
This was SVN commit r1327.
2004-11-15 17:34:51 +00:00
dc8e6c96cb Minor function name change omited in last update.
This was SVN commit r1323.
2004-11-15 03:12:51 +00:00
Fire Giant
de986348fb JS file for message box.
This was SVN commit r1322.
2004-11-15 03:07:20 +00:00
Fire Giant
28597647e1 Added the message box.
This was SVN commit r1321.
2004-11-15 02:24:03 +00:00
Fire Giant
7b9bb90995 Added Message Box support.
This was SVN commit r1320.
2004-11-15 02:21:54 +00:00
Fire Giant
2e1358e5dd Added sprites for Message Box.
This was SVN commit r1319.
2004-11-15 02:19:36 +00:00
2c3ce94950 GUI updated with revised twin-coordinate system (still have to make most of the objects use it, though).
This was SVN commit r1318.
2004-11-15 00:13:21 +00:00
Fire Giant
cae40c819c Removed 1_global.xml since it's not needed any more (replaced by 1_init.xml and 6_global.xml).
This was SVN commit r1317.
2004-11-14 21:39:44 +00:00
Fire Giant
d7da07e5c2 Due to the recent GUI load sequence changes, the JS init code goes into this file (previously named 1_global.xml).
This was SVN commit r1316.
2004-11-14 21:31:50 +00:00
819fad8520 Various GUI updates and fixes, in particular beginning of an overhaul of the Status Orb.
This was SVN commit r1310.
2004-11-13 04:46:05 +00:00
c1329429e1 GUI updates to finish off Mark's big combat demo.
This was SVN commit r1305.
2004-11-11 23:54:41 +00:00
24538f5b41 Minor update to fix HP.
This was SVN commit r1294.
2004-11-08 03:46:04 +00:00
Fire Giant
31ac2a5e03 Commiting Stuart's GUI updates.
This was SVN commit r1292.
2004-11-08 00:41:54 +00:00
Fire Giant
ee21933c49 Commiting Stuart's GUI updates (Mouse position shown right to FPS counter).
This was SVN commit r1291.
2004-11-08 00:40:10 +00:00
Fire Giant
8658526529 Commiting Stuart's updated GUI files (GUI toggled to bottom at launch, and other minor fixes).
This was SVN commit r1290.
2004-11-08 00:35:26 +00:00
Fire Giant
dc69bb3682 CVS commit test, just inserted some comments into the file :)
This was SVN commit r1271.
2004-10-23 17:16:52 +00:00
b0fcfb8a55 Updated GUI script to get ensure all objects have discrete widths and heights (no more control blocking).
This was SVN commit r1248.
2004-10-16 12:49:03 +00:00
c8cb07fb59 Updated GUI.
This was SVN commit r1247.
2004-10-15 22:15:31 +00:00
168ab4b962 Added 4_manual.xml (okay, it's only a placeholder for now, but you have to start somewhere).
This was SVN commit r1244.
2004-10-15 18:02:35 +00:00
Gee
1d4ebcca24 Added minimap setting, and progress bar settings (they are not as described in the TDD, they are renamed to sprite-background and sprite-bar).
This was SVN commit r1233.
2004-10-14 05:54:51 +00:00
Calefaction
51fbfc57db Updated to use mini-map object
This was SVN commit r1231.
2004-10-08 01:10:44 +00:00
714d41cbbe Placeholder XMLs to stop the GUI loader from complaining until the Real McCoy is ready.
This was SVN commit r1228.
2004-10-07 21:07:01 +00:00
MarkT
2aeaa40326 Updates to the entity XMLs (they work like the DD says they should, now - more or less)
This was SVN commit r1221.
2004-10-07 19:34:19 +00:00
bc669568f9 Updated GUI for Cavalry Dude.
This was SVN commit r1205.
2004-10-01 09:40:25 +00:00
5c850d51cd Fix for Mini-Map.
This was SVN commit r1203.
2004-09-30 16:09:45 +00:00
a8ef15b665 Lengthened boundary of FPS counter; was wrapping when longer than 2 digits.
This was SVN commit r1190.
2004-09-22 16:43:11 +00:00
baab0311e2 Some alterations from Malte
This was SVN commit r1143.
2004-09-11 19:53:48 +00:00
Gee
659645394b Made primarily 0 A.D. logo ghost, otherwise the logo blocks and steels parts of the Single Player buttons hovering space.
This was SVN commit r1141.
2004-09-07 02:44:11 +00:00
c81ad2d1d4 Code for GUI frame counter to work with Philip's getFPS() function.
This was SVN commit r1124.
2004-09-05 18:44:00 +00:00
e29fd0deba Updated GUI with overlays for main menu.
This was SVN commit r1120.
2004-09-05 10:21:56 +00:00
Gee
30eb103c20 Places the intro-button perfectly
This was SVN commit r1102.
2004-09-02 14:41:33 +00:00
Gee
bddabc48f8 Changed textalign and textvalign to text-align and text-valign.
This was SVN commit r1100.
2004-09-02 03:03:43 +00:00
Gee
7e5ec93036 Minor change I forgot to make.
This was SVN commit r1090.
2004-08-31 03:24:42 +00:00
Gee
705682a2cd Added buffer-zone as setting.
This was SVN commit r1089.
2004-08-31 03:22:39 +00:00
Gee
f0fbd8a961 Added buffer-zone in default style and changed the text-test some.
This was SVN commit r1088.
2004-08-31 03:22:13 +00:00
Gee
9ce8a4ced8 Specifics for icon added.
This was SVN commit r1087.
2004-08-31 02:18:57 +00:00
e76c245227 Various fixes from Malte, including a General's Tent main menu.
This was SVN commit r1082.
2004-08-29 19:33:22 +00:00
195ce6cec8 Script for resource counters.
This was SVN commit r1070.
2004-08-27 20:09:13 +00:00
b9d4c282fb Moved the resource counters over by a couple of pixels.
This was SVN commit r1066.
2004-08-27 17:37:14 +00:00
357874a48c Portrait code for Dudette.
This was SVN commit r1063.
2004-08-26 10:41:10 +00:00
71753a875f More GUI updates.
This was SVN commit r1061.
2004-08-26 10:37:27 +00:00
8943b1a0f2 Realigned resource icons to right.
This was SVN commit r1058.
2004-08-26 09:28:10 +00:00
b2a2f447f7 New GUI files to match the new fonts and resource icons.
This was SVN commit r1057.
2004-08-26 08:19:33 +00:00
aba8d1daaa Updated GUI scripts to include references to all the new GUI images for the next PASAP milestone in sprite1, and implemented some of it in hello and basefunctions. Mostly just throwing images on the screen, but some new stuff like it shows portraits and stat icons when clicking units now.
This was SVN commit r1047.
2004-08-24 17:17:23 +00:00
746662c053 Improved some GUI object alignment in hello.xml.
This was SVN commit r967.
2004-08-11 19:07:07 +00:00
db527961d4 *** empty log message ***
This was SVN commit r929.
2004-08-06 16:14:06 +00:00
ba122796f7 Added new GUI from Malte, with a few improvements when merging (note: needs new art in Art Pack too).
This was SVN commit r928.
2004-08-06 15:36:19 +00:00
aabfd9a49d A couple of nice Start Game and End Game buttons, so that you don't have to use the Console
This was SVN commit r913.
2004-08-05 13:09:42 +00:00
MarkT
d8b5d3a78d Directory structure shuffle.
This was SVN commit r886.
2004-08-02 23:14:06 +00:00
MarkT
fb9eceeda6 Added/rebound some keys
This was SVN commit r810.
2004-07-23 10:58:51 +00:00
MarkT
be524141be Much longer config file
This was SVN commit r806.
2004-07-22 16:20:43 +00:00
MarkT
939bdae5cb Update to entity data files in preparation for orders sytem
This was SVN commit r784.
2004-07-20 19:31:30 +00:00
a79add7fa0 Text and textures
This was SVN commit r749.
2004-07-13 22:51:02 +00:00
3ff9bfba4f More consistent attribute naming
This was SVN commit r748.
2004-07-13 22:50:38 +00:00
4a9b08928a .js file for GUI testing
This was SVN commit r733.
2004-07-12 17:04:09 +00:00
4c1d96341e New GUI
This was SVN commit r709.
2004-07-11 18:32:33 +00:00
5645a13d1a Updated DTD
This was SVN commit r707.
2004-07-11 16:35:11 +00:00
8760a628a4 Be less obnoxious
This was SVN commit r663.
2004-07-08 15:15:21 +00:00
0b48b21ae7 Copied GUI XML files in preparation for the new code
This was SVN commit r648.
2004-07-07 19:13:10 +00:00