1
0
forked from 0ad/0ad
Commit Graph

200 Commits

Author SHA1 Message Date
aab60e9ab8 Unbroke text-alignment buffer-zones. Allowed \n in tooltip text.
This was SVN commit r1585.
2004-12-28 12:38:45 +00:00
156ff7cf56 Minimal text-alignment ability in Text GUI objects
This was SVN commit r1584.
2004-12-28 12:17:04 +00:00
05c4ec0365 Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it.
This was SVN commit r1580.
2004-12-27 23:27:26 +00:00
7e004f07d3 Report zero-sized images as errors.
This was SVN commit r1566.
2004-12-23 23:14:47 +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
28c7a682b8 Fixed annoying crash when SpiderMonkey's GC ran.
Minor tooltip updates.

This was SVN commit r1542.
2004-12-21 18:41:58 +00:00
659a9ea57a Initial (incomplete) tooltip code
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
91d39f9a29 Allowed colour strings in XML files to contain negative values.
Updated GUI sprite effects to allow subtraction with add-color, and to
increase multiply-color's upper limit to allow 4x brightness.

This was SVN commit r1538.
2004-12-19 20:09:23 +00:00
4560c79667 'stretched:' sprites
This was SVN commit r1537.
2004-12-19 14:44:55 +00:00
849f50a500 Grayscale effects for GUI sprites
This was SVN commit r1536.
2004-12-19 12:20:04 +00:00
46f5c61179 Linux/GCC/glibc Compat
This was SVN commit r1532.
2004-12-18 23:30:28 +00:00
b291fafadb Replace '_' with '-' when passing names through the GUI JS interface (so that object.cell_id is equivalent to object["cell-id"])
This was SVN commit r1526.
2004-12-18 14:24:50 +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
6526301cfe GUI icon-sheets
This was SVN commit r1519.
2004-12-17 16:20:08 +00:00
8f4f8e240f Fixed things that use a colour rather than a texture (e.g. the progress bars). Also fixed the completely broken 'caching' system that recalculated everything every single frame. Also made it give linker errors if I ever make that mistake again.
This was SVN commit r1518.
2004-12-17 00:05:37 +00:00
b534e640ca Resource leak fixes
This was SVN commit r1513.
2004-12-16 12:01:47 +00:00
855c00f6b8 Slightly tidied some small things
This was SVN commit r1510.
2004-12-16 00:47:12 +00:00
c19f3608a5 Initial changes to GUI sprite code. (There shouldn't be any visible effects - if there are, they're bugs)
This was SVN commit r1507.
2004-12-15 21:24:46 +00:00
80b1876b77 Reduced GUI's exception usage (=> shortened debug-mode start time by a couple of seconds)
This was SVN commit r1494.
2004-12-13 12:07:12 +00:00
6d7d049d89 Attempted to minimise dependencies between header files (to make compilation minorly faster)
This was SVN commit r1490.
2004-12-12 19:43:55 +00:00
6a04509455 Fixed Release-mode compilation
This was SVN commit r1478.
2004-12-09 16:09:58 +00:00
e2062ccee1 Faster parsing
This was SVN commit r1477.
2004-12-08 18:15:39 +00:00
a2a6f29ab3 s/Prometheus/Pyrogenesis/
This was SVN commit r1459.
2004-12-05 21:56:09 +00:00
ffb5f87857 Corrected mesh manager's use of hashmap. Added CStrW support to JS/GUI interface. Added error checking to CStr::Left/Right to make bugs more obvious.
This was SVN commit r1456.
2004-12-05 18:26:43 +00:00
453c8c68af Fixed warnings
This was SVN commit r1445.
2004-12-02 17:17:38 +00:00
MarkT
f930bf1df4 Added semi-intelligent text parser for XMLs - so that numeric properties on entities are no longer stored as strings instead.
This was SVN commit r1409.
2004-11-27 20:02:51 +00:00
Gee
0adc8f6ca2 Unfinished Input box.
This was SVN commit r1394.
2004-11-24 23:39:52 +00:00
4af3eca831 Prefer compile-time errors to run-time errors
This was SVN commit r1311.
2004-11-14 18:52:22 +00:00
MarkT
793794649f Combat code, some scripting, broken network, and fixed some bugs.
This was SVN commit r1301.
2004-11-11 07:09:32 +00:00
3136791492 Linux/GCC Compat(tm)
This was SVN commit r1284.
2004-11-07 21:30:47 +00:00
5ab0be984b CStr alterations
This was SVN commit r1283.
2004-10-31 22:00:01 +00:00
5e42dad394 CStr alterations
This was SVN commit r1282.
2004-10-31 20:29:09 +00:00
0c95417dec Avoid type warnings
This was SVN commit r1274.
2004-10-23 19:24:55 +00:00
MarkT
d33d2e4450 Added some support for user profiles
This was SVN commit r1270.
2004-10-23 14:39:28 +00:00
Calefaction
50dee130ae Updated to properly support LOD bias settings in config. Fixes mipmap blurryness.
This was SVN commit r1254.
2004-10-17 21:01:00 +00:00
e31edf4fb4 Fixed mouse-wheel zooming
This was SVN commit r1253.
2004-10-17 10:55:57 +00:00
45ffe69f90 fix sign conversion bug (int -> size_t)
This was SVN commit r1241.
2004-10-15 13:42:13 +00:00
Gee
fd91563f42 Sorry! Totally forgot to add the CInput.cpp/h
This was SVN commit r1237.
2004-10-14 21:01:13 +00:00
Gee
f4b410ff82 A bunch of updates:
- Added *unfinished* control input.
- The GUI captures the events now, so that you can't press anything in
the game if the GUI is infront of it. The GUI needs some cleaning up
though.
- Made the type 'empty' unpressable, because all those "0 0 100% 100%"
empties were just like pieces of glass making the user unable to select
anything in the game.
- A bunch of other updates I made like weeks ago and never committed.

This was SVN commit r1234.
2004-10-14 10:09:26 +00:00
Gee
c4684effb6 Progress bar added, and an optional attribute for the [icon] tags in text.
You can now displace an icon using: "[icon="smiley" displace="2 -3"]

I may rename it from 'displace' to something else if someone gives me a
good suggestion.

This was SVN commit r1232.
2004-10-14 02:32:26 +00:00
Calefaction
5275dc862b Initial mini-map check-in
This was SVN commit r1230.
2004-10-08 01:10:14 +00:00
df1b502bbd Linux Compat and some updated PARANOIA code
This was SVN commit r1189.
2004-09-22 15:20:58 +00:00
167a077bc2 fix headers: ogl_tex.h is user-level texture stuff, tex.h is only the texture loader.
this came up due to header change - some unnecessary stuff isn't
included by default anymore.

This was SVN commit r1152.
2004-09-19 11:38:54 +00:00
03e3de50ed When I said "Now fixed", I was wrong. But it's fixed now.
This was SVN commit r1140.
2004-09-06 12:54:35 +00:00
806dea648c Er... broke stuff. Now fixed.
This was SVN commit r1138.
2004-09-06 11:37:15 +00:00
e532b59ead Utilised the corrected CStr8/W conversion
This was SVN commit r1137.
2004-09-06 11:35:42 +00:00
a9d7f0dae8 Fixed minor bug when displaying text containing a "%". Used LOG_ONCE to avoid continuous error logging. Removed redundant Trim (Xeromyces always trims element text)
This was SVN commit r1136.
2004-09-06 11:34:46 +00:00
7008e5b53c Updated to handle Unicode strings
This was SVN commit r1135.
2004-09-06 11:28:30 +00:00
Gee
071bb19282 no message
This was SVN commit r1128.
2004-09-06 03:05:36 +00:00
Gee
da465ae1dc Made a little change only to make it compile, hopefully it won't do too much damage until Philip can correct this.
This was SVN commit r1126.
2004-09-06 02:22:38 +00:00
Gee
9133042540 GUI: Translates and outputs localised string in Unicode... hooray!
This was SVN commit r1125.
2004-09-06 02:21:21 +00:00
3b15f3f1e4 Text alignment alterations
This was SVN commit r1119.
2004-09-04 20:35:12 +00:00
933f51d48b Made text always be placed at integer positions, to avoid it looking too ugly
This was SVN commit r1118.
2004-09-04 19:05:25 +00:00
3ef7b1b67b Corrected JS_AddRoot usage (it wants a JSObject**/JSString**/jsval*/etc)
This was SVN commit r1116.
2004-09-04 14:43:23 +00:00
51e20e6ef6 Realised that there's no need to store the JSObject* as a void*
This was SVN commit r1115.
2004-09-04 14:40:06 +00:00
c164d9b32c Made buffer-zone consistently a float
This was SVN commit r1114.
2004-09-03 21:37:39 +00:00
9b1127d82f Type checking in dangerous pointer-using code
This was SVN commit r1113.
2004-09-03 21:25:39 +00:00
c0342b1ff7 JS GUI interface changes to handle floating-point sizes, plus a few fewer bugs
This was SVN commit r1111.
2004-09-03 14:12:43 +00:00
Gee
d42de50280 Updated everything that's related to screen position to use floats
This was SVN commit r1107.
2004-09-03 05:48:47 +00:00
Gee
ab63c17678 no message
This was SVN commit r1106.
2004-09-02 19:35:07 +00:00
Gee
6b384432e0 no message
This was SVN commit r1101.
2004-09-02 03:05:16 +00:00
Gee
f2a615f0a3 Updates, mostly about centering text.
This was SVN commit r1099.
2004-09-02 03:02:32 +00:00
44ddbd201f Removed an old unused #define
This was SVN commit r1092.
2004-09-01 19:23:02 +00:00
Gee
e2a8eb4def Removed some debug output in log only I need to see.
This was SVN commit r1091.
2004-08-31 03:25:36 +00:00
Gee
924b0bf1b4 Major fixes and updates. Let me know if I screwed up resolving conflicts.
This was SVN commit r1085.
2004-08-31 02:09:58 +00:00
70d84beab2 Altered font handling -- now uses CFont in preference to unifont_* (yay, pointless OO) and allows font mapping ("default"=>"palatino12", etc) using .cfg files
This was SVN commit r1074.
2004-08-27 22:08:30 +00:00
4041b7880e Made missing textures non-fatal
This was SVN commit r1059.
2004-08-26 10:31:34 +00:00
9cd4cab693 A few log categories
This was SVN commit r994.
2004-08-15 20:57:31 +00:00
ed9671e8d7 Fixed JS complaints about missing 'prototype'
This was SVN commit r988.
2004-08-14 11:23:38 +00:00
77eb2d7db8 finally removing; it has no function
This was SVN commit r962.
2004-08-10 16:04:21 +00:00
657b1fee60 Simplified ReportParseError (to make GCC happier)
This was SVN commit r945.
2004-08-09 16:29:21 +00:00
ac9bb18ed7 added debug_warns where there were TODO gee: report error comments
This was SVN commit r940.
2004-08-08 18:21:58 +00:00
138df056bd Fixed invalid GL code
This was SVN commit r924.
2004-08-06 15:01:23 +00:00
1bbb35b204 Variable fonts in the GUI
This was SVN commit r871.
2004-07-31 19:52:15 +00:00
520ff37f70 Variable fonts in the GUI
This was SVN commit r858.
2004-07-31 13:37:35 +00:00
bbb57ac6db Removed references to font.h
This was SVN commit r856.
2004-07-31 12:44:13 +00:00
8b1cec7038 Removed some mildly unpleasant usages of temporary objects
This was SVN commit r852.
2004-07-31 11:29:28 +00:00
741699190a Fixed a couple of crashes
This was SVN commit r851.
2004-07-31 11:28:24 +00:00
5f810002c7 Changed error handling in Xeromyces
This was SVN commit r845.
2004-07-29 16:17:21 +00:00
386900c0fc Linux/GCC Compat
This was SVN commit r819.
2004-07-27 00:26:51 +00:00
48d0bdff97 Added 'tick' action to GUI objects
This was SVN commit r816.
2004-07-24 19:09:12 +00:00
233513ce3c Fixed loads of /W4 warnings, because it's easier than doing anything useful. Added some asserts to check potentially dangerous assumptions, implemented a few missing bits of code, adjusted some comments, etc.
This was SVN commit r815.
2004-07-24 14:11:12 +00:00
fe1bee706b Fixed loads of /W4 warnings, because it's easier than doing anything useful. Added some asserts to check potentially dangerous assumptions, implemented a few missing bits of code, adjusted some comments, etc.
This was SVN commit r814.
2004-07-24 14:04:40 +00:00
MarkT
6d8b9e33ef Minor additions: Added hotkeys to GUI buttons, camera bookmarking (not sure if this system will stay), shoring up some JS error checking, moved a bunch of constants into the config file and added a new rotation mode.
This was SVN commit r804.
2004-07-22 16:18:12 +00:00
56e41b3003 Yet more fun with errors
This was SVN commit r771.
2004-07-18 11:51:15 +00:00
1e40ed1543 More attempted error handling
This was SVN commit r769.
2004-07-17 17:09:33 +00:00
f2cc629ca9 Exception classes to allow hierarchical catching and to work reasonably nicely with the crash log
This was SVN commit r759.
2004-07-15 19:10:33 +00:00
55539690f9 Fix texture alignment
This was SVN commit r753.
2004-07-14 10:40:36 +00:00
977693c7db GUI text renderer
This was SVN commit r745.
2004-07-13 22:48:53 +00:00
8ceb41212d Die more in scripts
This was SVN commit r725.
2004-07-12 15:52:53 +00:00
ec63db7967 Make XMB files store line numbers, so XML inline scripts can be debugged easily
This was SVN commit r723.
2004-07-12 15:50:12 +00:00
2537d1bc6e GUI/scripting updates
This was SVN commit r708.
2004-07-11 18:18:54 +00:00
cf9d8b9797 GUI/scripting updates
This was SVN commit r706.
2004-07-11 16:22:35 +00:00
d38ed70623 Realised why putting utf16string into std is a silly idea
This was SVN commit r700.
2004-07-11 11:51:27 +00:00
073a683e56 gcc fixes
This was SVN commit r694.
2004-07-10 21:23:06 +00:00
0eecb81bac wchar_t/etc fixes
This was SVN commit r692.
2004-07-10 20:56:15 +00:00
970685e82c wchar_t/etc fixes
This was SVN commit r690.
2004-07-10 20:33:42 +00:00
268d81ad27 Fixed another memory leak
This was SVN commit r680.
2004-07-10 12:51:35 +00:00
af9c336b43 JS GUI interface
This was SVN commit r666.
2004-07-08 15:23:47 +00:00
a9e358b9bc change to use new event handler interface
This was SVN commit r598.
2004-06-24 14:06:24 +00:00