Commit graph

339 commits

Author SHA1 Message Date
Ykkrosh
0de796c5ea Send Load event to GUI objects after (instead of while) loading the rest of the engine
This was SVN commit r1635.
2005-01-04 21:51:23 +00:00
Ykkrosh
31f0e62c83 Changed the add_color GUI sprite effect to use alpha=0 by default
This was SVN commit r1625.
2005-01-03 22:23:27 +00:00
Ykkrosh
15bb170328 SessionStart event sent to GUI objects upon starting a game
This was SVN commit r1608.
2005-01-01 17:30:55 +00:00
Ykkrosh
f9c51d8ec7 Replaced - with _ in GUI
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
Ykkrosh
1c2acfed8c CInput textcolor
This was SVN commit r1602.
2004-12-31 12:20:22 +00:00
Ykkrosh
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
Ykkrosh
659a9ea57a Initial (incomplete) tooltip code
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
Ykkrosh
849f50a500 Grayscale effects for GUI sprites
This was SVN commit r1536.
2004-12-19 12:20:04 +00:00
Ykkrosh
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
Ykkrosh
6526301cfe GUI icon-sheets
This was SVN commit r1519.
2004-12-17 16:20:08 +00:00
Ykkrosh
855c00f6b8 Slightly tidied some small things
This was SVN commit r1510.
2004-12-16 00:47:12 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
a2a6f29ab3 s/Prometheus/Pyrogenesis/
This was SVN commit r1459.
2004-12-05 21:56:09 +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
Ykkrosh
5ab0be984b CStr alterations
This was SVN commit r1283.
2004-10-31 22:00:01 +00:00
Ykkrosh
5e42dad394 CStr alterations
This was SVN commit r1282.
2004-10-31 20:29:09 +00:00
MarkT
d33d2e4450 Added some support for user profiles
This was SVN commit r1270.
2004-10-23 14:39:28 +00:00
Ykkrosh
e31edf4fb4 Fixed mouse-wheel zooming
This was SVN commit r1253.
2004-10-17 10:55:57 +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
janwas
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
Ykkrosh
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
Ykkrosh
806dea648c Er... broke stuff. Now fixed.
This was SVN commit r1138.
2004-09-06 11:37:15 +00:00
Ykkrosh
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
Gee
071bb19282 no message
This was SVN commit r1128.
2004-09-06 03:05:36 +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
Ykkrosh
3b15f3f1e4 Text alignment alterations
This was SVN commit r1119.
2004-09-04 20:35:12 +00:00
Ykkrosh
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
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
f2a615f0a3 Updates, mostly about centering text.
This was SVN commit r1099.
2004-09-02 03:02:32 +00:00
Ykkrosh
44ddbd201f Removed an old unused #define
This was SVN commit r1092.
2004-09-01 19:23:02 +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
Ykkrosh
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
Ykkrosh
4041b7880e Made missing textures non-fatal
This was SVN commit r1059.
2004-08-26 10:31:34 +00:00
Ykkrosh
9cd4cab693 A few log categories
This was SVN commit r994.
2004-08-15 20:57:31 +00:00
janwas
77eb2d7db8 finally removing; it has no function
This was SVN commit r962.
2004-08-10 16:04:21 +00:00
Ykkrosh
657b1fee60 Simplified ReportParseError (to make GCC happier)
This was SVN commit r945.
2004-08-09 16:29:21 +00:00
Ykkrosh
138df056bd Fixed invalid GL code
This was SVN commit r924.
2004-08-06 15:01:23 +00:00
Ykkrosh
520ff37f70 Variable fonts in the GUI
This was SVN commit r858.
2004-07-31 13:37:35 +00:00
Ykkrosh
5f810002c7 Changed error handling in Xeromyces
This was SVN commit r845.
2004-07-29 16:17:21 +00:00
olsner
386900c0fc Linux/GCC Compat
This was SVN commit r819.
2004-07-27 00:26:51 +00:00
Ykkrosh
48d0bdff97 Added 'tick' action to GUI objects
This was SVN commit r816.
2004-07-24 19:09:12 +00:00
Ykkrosh
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
Ykkrosh
1e40ed1543 More attempted error handling
This was SVN commit r769.
2004-07-17 17:09:33 +00:00
Ykkrosh
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
Ykkrosh
55539690f9 Fix texture alignment
This was SVN commit r753.
2004-07-14 10:40:36 +00:00
Ykkrosh
977693c7db GUI text renderer
This was SVN commit r745.
2004-07-13 22:48:53 +00:00
Ykkrosh
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
Ykkrosh
2537d1bc6e GUI/scripting updates
This was SVN commit r708.
2004-07-11 18:18:54 +00:00
Ykkrosh
cf9d8b9797 GUI/scripting updates
This was SVN commit r706.
2004-07-11 16:22:35 +00:00
Ykkrosh
d38ed70623 Realised why putting utf16string into std is a silly idea
This was SVN commit r700.
2004-07-11 11:51:27 +00:00
Ykkrosh
073a683e56 gcc fixes
This was SVN commit r694.
2004-07-10 21:23:06 +00:00
Ykkrosh
0eecb81bac wchar_t/etc fixes
This was SVN commit r692.
2004-07-10 20:56:15 +00:00
Ykkrosh
970685e82c wchar_t/etc fixes
This was SVN commit r690.
2004-07-10 20:33:42 +00:00
Ykkrosh
af9c336b43 JS GUI interface
This was SVN commit r666.
2004-07-08 15:23:47 +00:00
janwas
a9e358b9bc change to use new event handler interface
This was SVN commit r598.
2004-06-24 14:06:24 +00:00
Ykkrosh
20211609c5 Added tolerance for whitespace, to fix assert
This was SVN commit r593.
2004-06-23 16:00:19 +00:00
janwas
fc476e04f6 stomped on numerous warnings
This was SVN commit r584.
2004-06-21 16:29:47 +00:00
Ykkrosh
561299f899 Memory leak fix
This was SVN commit r565.
2004-06-19 20:54:36 +00:00
Ykkrosh
673c7d7318 Replace L".." with (XMLCh*)L"...", for gcc
This was SVN commit r540.
2004-06-18 18:55:26 +00:00
janwas
4258ba245d while working on cstr, search and destroy made "CStr &x" -> "CStr& x". didn't intend to hit gui code, but ok :)
This was SVN commit r534.
2004-06-18 14:07:06 +00:00
Ykkrosh
ea68626ec1 Remove new new (Xerces doesn't like it)
This was SVN commit r516.
2004-06-15 21:08:05 +00:00
olsner
a5c221fe16 fixed some unfreed XMLString::transcode's - I think I stomped them all
This was SVN commit r504.
2004-06-13 23:36:16 +00:00
janwas
15ca5cbf21 newline stomper and fixed warnings
This was SVN commit r473.
2004-06-11 02:14:18 +00:00
janwas
9c9af2ab75 moved all xerces includes into XML.h
(rationale: they're in the PCH - speeds up the build)

This was SVN commit r434.
2004-06-09 12:45:42 +00:00
janwas
c7a84e84be added precompiled.h everywhere
This was SVN commit r392.
2004-06-03 18:38:14 +00:00
janwas
4daa183dd3 stripped some headers from deprecated prometheus.h => huge rearrange
This was SVN commit r378.
2004-06-03 01:43:33 +00:00
janwas
6782c17105 fixed a few warnings; updated vfs file enum code
This was SVN commit r375.
2004-06-03 00:20:20 +00:00
olsner
01e94151cf added usage of SDL_BUTTON_WHEELUP/DOWN instead of the win-specific constant values
This was SVN commit r351.
2004-06-02 15:22:19 +00:00
janwas
246662f01f fixed some warnings and one signed/unsigned bug
This was SVN commit r291.
2004-05-29 11:59:59 +00:00
Gee
e326ebae46 major update
This was SVN commit r290.
2004-05-29 04:06:50 +00:00
Gee
e21ebb37f5 Major updates
This was SVN commit r141.
2003-12-27 06:26:03 +00:00
Gee
d082065d71 no message
This was SVN commit r131.
2003-12-01 07:26:50 +00:00
Gee
512bfd4067 no message
This was SVN commit r128.
2003-12-01 07:06:55 +00:00
Gee
1e33ef7eb2 Added "&" to some function pointers that was being complained at by GCC
This was SVN commit r116.
2003-11-27 19:08:03 +00:00
Gee
6d86a928a3 no message
This was SVN commit r92.
2003-11-25 02:47:12 +00:00
Gee
90bbd48a14 no message
This was SVN commit r77.
2003-11-24 17:13:37 +00:00
Gee
5122b0f906 no message
This was SVN commit r74.
2003-11-24 02:18:41 +00:00
Gee
b095ca8176 no message
This was SVN commit r71.
2003-11-22 15:07:22 +00:00
Gee
24d48f2308 Uses CStr now, no ICE in VC6
This was SVN commit r49.
2003-11-07 01:55:29 +00:00
Gee
da6d6c60a9 Updates making CGUI a singleton
This was SVN commit r38.
2003-11-06 11:54:46 +00:00
Gee
8d0cb1b954 Some updates on the file layout
This was SVN commit r28.
2003-11-05 22:34:38 +00:00
janwas
a6e23bb2e6 no message
This was SVN commit r23.
2003-11-04 23:59:41 +00:00
janwas
df5cf51fa3 no message
This was SVN commit r22.
2003-11-04 23:41:42 +00:00
Gee
42cfadb6bb int i
This was SVN commit r20.
2003-11-04 22:46:08 +00:00
janwas
5cc814759f Initial revision
This was SVN commit r9.
2003-11-03 16:22:45 +00:00