1
0
forked from 0ad/0ad
Commit Graph

227 Commits

Author SHA1 Message Date
249aaf436f Allowed JS access to GUI object event handlers, via object.onPress etc.
Stopped crashes when ordering entities without bounding boxes.

This was SVN commit r2079.
2005-03-29 22:04:38 +00:00
b58a6339bb Stopped undesirable loading-screen blending
This was SVN commit r2043.
2005-03-24 00:02:54 +00:00
ae172a9a01 Disabled mipmaps on GUI textures and cursors
This was SVN commit r1999.
2005-03-17 00:06:51 +00:00
e6c8cef293 types.h => lib/types.h (avoid name collision)
This was SVN commit r1935.
2005-02-26 15:13:15 +00:00
7134b17949 Fixed warnings, and made some minor changes for consistency with other code (wchar_t(' ') => L' ', and stack-allocated CFonts)
This was SVN commit r1908.
2005-02-05 14:53:06 +00:00
Gee
008f62b026 Removed temporary log output
This was SVN commit r1906.
2005-02-05 07:32:06 +00:00
Gee
4113aa0a36 GUI Update. Mostly with Input Control Beta :)
This was SVN commit r1904.
2005-02-05 07:25:16 +00:00
aca9ce6c3c MiniMap GCC and crash bug fix as well as some miscellany
This was SVN commit r1896.
2005-02-02 17:03:37 +00:00
NoMonkey
0b903415dd Player models now render shadows.
Viewing rectangle now moves with the camera on the mini-map and shows
it's FOV correctly.  Currently it is a little out of place and possibly
out of scale as well.

This was SVN commit r1872.
2005-01-30 06:27:07 +00:00
4ed4a7e16d Fix for the crash when a client connects, as well as some minor additions to client/server code
This was SVN commit r1861.
2005-01-29 16:51:13 +00:00
faff797cd6 include SDL or lib/input.h where needed (since lib.h no longer pulls it in)
input.h now includes SDL (no more macro hackery to avoid the dependency)

This was SVN commit r1837.
2005-01-27 15:31:06 +00:00
NoMonkey
d7b3d6b0c7 Added a new material, "player_trans.xml" which will give a model player color. So now if you want a player to be colored, just add this material!
This was SVN commit r1830.
2005-01-27 02:52:26 +00:00
NoMonkey
ed27392768 Made the minimap display the player colors and represent their positions correctly.
This was SVN commit r1821.
2005-01-26 00:19:17 +00:00
d29833e4ed mouse_x/y => g_mouse_x/y
This was SVN commit r1767.
2005-01-23 17:35:36 +00:00
71e3b4e289 Allow clipboard pasting into input boxes (with the same hotkeys as the console - insert or ctrl+v)
This was SVN commit r1752.
2005-01-22 18:46:03 +00:00
2077698156 New JavaScript interface for the network client, plus some linux/gcc/misc fixes
This was SVN commit r1730.
2005-01-17 04:52:02 +00:00
38b30e5eb4 Corrected ICC errors and some warnings. Removed some unnecessarily verbose logging. Did minor things.
This was SVN commit r1718.
2005-01-13 00:17:31 +00:00
37d2d83a9d Adjusted things to work with the new top-down orientation
This was SVN commit r1668.
2005-01-07 14:10:14 +00:00
f7e82dbc16 add ps/Errors.h and/or lib/types.h headers (shouldn't rely on precompiled.h to pull those in).
also prepended ps/ to make location clear.

This was SVN commit r1652.
2005-01-07 00:47:44 +00:00
bb8e24ec60 Corrected spelling
This was SVN commit r1637.
2005-01-04 22:07:17 +00:00
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
a61a961edd Don't display blank tooltips
This was SVN commit r1634.
2005-01-04 21:37:51 +00:00
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
15bb170328 SessionStart event sent to GUI objects upon starting a game
This was SVN commit r1608.
2005-01-01 17:30:55 +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
9e2413acab Allowed \\ in tooltip text. Fixed tooltips.
This was SVN commit r1587.
2004-12-28 13:13:27 +00:00
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