Commit graph

459 commits

Author SHA1 Message Date
prefect
b889826a3d Some Linux compile fixes over the place.
Create TerrainRenderer, ShadowMap and WaterManager classes to divide
CRenderer's functions into more logical units.

This was SVN commit r3332.
2006-01-07 01:04:26 +00:00
janwas
b242eafd02 various small fixes; some changes as in previous rev (which was only the files in lib/)
split a part of win.cpp up into wsysdep
GameSetup: bugfix for incorrect window title text

This was SVN commit r3204.
2005-12-07 03:44:17 +00:00
Ykkrosh
78c835a590 Put opened drop-down lists on top of most other GUI controls (by increasing their z value)
This was SVN commit r3175.
2005-11-26 22:42:51 +00:00
janwas
d64561d18d minimap: fix issue where changes to terrain might not be noticed
losmanager: only comment out timer_accrue

This was SVN commit r3105.
2005-11-06 04:22:47 +00:00
janwas
15cce8566f minimap: only update 10x/sec and if LOS state != ALL_VISIBLE; fix incorrect SAFE_DELETE
fix use of LOS_EXPLORED; == implies explored but not visible

This was SVN commit r3100.
2005-11-06 02:02:44 +00:00
janwas
6668ad6e1c CTerrain, Brushes: made CalcFromPosition static and added float x,y overload
minimap, PatchRData, renderer: fix ELOSState comparison vs & and use
SAFE_DELETE
ia32: add rounding control constants (for FISTP)
premake: set /QIfist compiler setting which causes float->int casts to
go through FISTP instruction instead of _ftol2() (much faster, but
requires CPU state to have been set)
LOSManager.cpp: cache m_TilesPerSize; use MIN/MAX; use
CTerrain::CalcFromPosition; clean up GetUnitState a bit. now runs at
203ns, down from 222

This was SVN commit r3099.
2005-11-06 01:33:16 +00:00
janwas
6af5888866 replace g_active with more clear g_app_has_focus and g_app_minimized
reinstate g_keys - realized that atlas mode cannot call SDL_GetKeyState
main: use g_app_minimized etc. to use up less CPU time when app isn't
active (makes debugging more bearable)

This was SVN commit r3070.
2005-10-31 18:36:36 +00:00
janwas
8c76dc34af g_keys[] has been made redundant by SDL's key array; use SDL_GetKeyState instead to get address of new keys array
fix W4 warnings (unused param and type conversion mostly)

This was SVN commit r3068.
2005-10-31 16:26:51 +00:00
janwas
2452e29f0d remove key- and mouse-state-clear code (previously called after alt+tab out). wsdl now takes care of this: by maintaining its own key array+sending up events for all currently down keys; and by capturing the mouse on each click.
-- this fixes "cursor keys require ctrl" bug reported by jason
wdbg_sym: fix warning
wsdl: as above and also better SDL_ACTIVEEVENT handling
mmgr: 500µs -> 500s -> 500us :)

This was SVN commit r3065.
2005-10-31 01:15:49 +00:00
Ykkrosh
f2b88d7792 GameSetup: "-autostart=mapname" command-line parameter, for faster testing.
Misc: Don't catch(...)
Atlas: Removed old project files; adjusted include paths.

This was SVN commit r3062.
2005-10-30 21:30:52 +00:00
prefect
501acc65f5 Extension function pointers are renamed from glXyzARB to pglXyzARB
to avoid conflicts with system header files.

This was SVN commit r3054.
2005-10-30 01:18:15 +00:00
prefect
998622ff54 Initialize some previously uninitialized variables.
This was SVN commit r3050.
2005-10-29 22:50:54 +00:00
Ykkrosh
178ad741b9 DevIL: Improved quality of DXT5 alpha compression.
textureconv: Made -(no)mipmaps work. Defaulted to DXT5 for alpha
textures (since DXT3 almost never seems any good). Recompiled with new
DevIL code.
GUIRenderer: Removed complaints about 0-sized objects (e.g. hitpoint
bars).
Atlas: Added forgotten files.

This was SVN commit r3006.
2005-10-24 23:45:52 +00:00
janwas
0d6dd7836d fix assumption that SDL_BUTTON < 3
add ClearMouseState to reset buttons when alt+tabbing out (thanks to
Philip for mentioning the problem and Gustav for telling me how to fix
it :D)

This was SVN commit r3003.
2005-10-24 21:10:45 +00:00
janwas
32cfc6d807 minimap: now use GUI event system instead of polling. fixes broken click feature.
textureentry: add performance note
list, text: fix mousewheel direction
input: was going to add a deque to allow registering handlers in back
and front. obviated by minimap fix, though. cleaned up a bit and renamed
stuff (again, sigh).
loaderthunks: fixed weird alignment/padding warning

This was SVN commit r2979.
2005-10-20 15:27:39 +00:00
janwas
bed9363bfe lib/input.h was old+bad code. fixed in_add_handler return type to enum; renamed EV_PASS to IN_PASS; no longer include sdl.h from other code (instead rely on input.h)
This was SVN commit r2975.
2005-10-20 17:44:56 +00:00
janwas
39060e7900 cinput, ogl_shader, h_mgr, vfs: stomp on warnings
ia32, sysdep: add rint()
minimap: saw TODO on GetMapSpaceCoords and sped it up by 15% using rintf
and precalculating scaleX
timer: add indication of how often something was billed (helps measure
stuff called an indeterminate number of times)

This was SVN commit r2973.
2005-10-19 20:26:53 +00:00
janwas
353260f8ec This was SVN commit r2971. 2005-10-19 17:42:37 +00:00
janwas
364e36128e g_YMinOffset declared in gameview.h instead of extern elsewhere
terrain: made const-correct
lib: Add round_up_to_pow2
minimap: cleanup. split user input and DrawViewRect out of Draw; add
m_Camera; made pointers const; user local x,x2 variables instead of
writing out m_CachedActualSize

This was SVN commit r2970.
2005-10-19 17:16:34 +00:00
janwas
02341916dc Minimap: refactor if() spanning 200 lines into if(!) return
cause of minimap click no longer working has been found:
GlobalInputHandler isn't getting called due to incorrect order of
registration. fix is pending.

game: add code from ScEd that fixes lack of player color (by setting up
local players)
thanks to Simon for finding the cause (I want that crystal ball :D)

This was SVN commit r2967.
2005-10-19 06:11:21 +00:00
Matei
2ef8a7b630 Sped up minimap rendering by having a separate LOS texture and recomputing only that per frame. To force a recompute of the terrain texture, set g_TerrainModified to true sometime before the render step of each frame (it is set back to false at the end of the frame).
This was SVN commit r2963.
2005-10-19 03:02:51 +00:00
janwas
953d2621dd timer: improved timer_add_client - no longer has fixed-size storage. btw, name will change here - not happy with SUM_TIMER.
GUI/input code: moved g_active, g_keys etc. into ps/Globals; it has its
own input handler as well

all users of fopen(): add file_make_full_native_path to get correct path
even though current dir = system/

This was SVN commit r2954.
2005-10-16 23:16:08 +00:00
Ykkrosh
d7996c104a CInput: swapped direction of mouse-wheel scrolling.
wsdl: initialise handles such that wsdl_shutdown doesn't try to close
them if they remain unchanged.
GameSetup: made work in Atlas.
Renderer: fixed progressive loading of water textures.

This was SVN commit r2941.
2005-10-14 21:59:08 +00:00
janwas
b6dfb8174f fix 64bit bug: wsdl defined SDL_Event.user.code as intptr_t, but real SDL doesn't. brought that in line and fixed GUIHotkey code.
config: proper detect for clock_gettime

file: file_rel_chdir -> file_set_root_dir; it no longer changes current
directory; instead, root dir is prepended to all paths (not that bad
perf-wise)

netlog: avoid a CRT assert if log file open failed. now that current dir
is no longer being set, we need to think about what will happen to the
logs - they either need to use file_make_full_native_path, or use the
entire file.cpp interface instead of fopen etc.

This was SVN commit r2936.
2005-10-13 19:11:22 +00:00
janwas
7b31f0372b GameView: move camera lock params here
wsdl: add proper event queuing mechanism (no longer requires hacky
polling for changes and avoids WM_USER)
rename keys[] and mouse_buttons to g_keys and g_mouse_buttons
fix flipped mouse wheel direction; wsdl now sends up AND down event
(removed 'reset' hack in main.cpp)
main: clean up event handler and kill_mainloop

This was SVN commit r2934.
2005-10-13 18:05:55 +00:00
janwas
990e343ae6 renderer: load/unload water textures (similar to alpha maps); do that in delay load and avoid leaking them.
GUIrenderer: add oglSquelchError

lib.h: add feq() (checks for floating point equality); remove redundant
if from SAFE_DELETE
maths: use new feq()
Model*RData, VertexArray: fix trivial warnings

This was SVN commit r2904.
2005-10-12 04:16:41 +00:00
Matei
0ed2815c8b Added initial version of LOS, and updated minimap to show both LOS and water.
LOS issues still outstanding:
- LOS looks ugly because of quad tesselation into 2 triangles
- Quad tesselation is unspecified by OpenGL (in fact using GL_QUADS on
LOS quads seemed to give different tesselations than it did for the
underlying terrain quads, but terrain rendering also used GL_QUADS).
This should be fixed once we decide on the quad tesselation issue.
- Units with traits.vision.permanent set are visible through FOW even if
you havent seen them before; this should only be true when you have seen
them before. But it gets even more complicated - if a permanent unit
seen through FOW dies or gets upgraded or something, perhaps you should
remember the old version. I'm not completely sure how to do this
(probably involves cloning its actor somehow).

This was SVN commit r2876.
2005-10-09 03:43:03 +00:00
prefect
04650efe7a Lots of gcc -Wall fixes. The common ones:
- switch() statements don't handle all values in an enum
- missing \n at end of file
- non-virtual destructors in classes containing virtual functions
- order of initializers in constructor initializer lists
... some other stuff (signedness, nested comments, unused variables) as
well.

This was SVN commit r2864.
2005-10-07 15:24:29 +00:00
Ykkrosh
2790981eae CVSROOT: doesn't seem particularly useful now
ObjectBase: removed support for old actor format
Various: reduced sometimes-unnecessary header inclusions
Atlas: slightly nicer tool and message systems

This was SVN commit r2816.
2005-09-30 00:59:42 +00:00
janwas
cd2f3948dd changed sys_cursor interface to load directly from file; can add createFromMemory version later if ever needed.
cursor: reflects the above; much simplified now.

ogl_tex: preserve all texture state across reloads. add quality
mechanism (perf boost on older cards). split up upload code. add
ogl_tex_transform(). add more docs.

renderer, GUIrenderer, unifont: bring in line with ogl_tex changes (int
-> uint and call setters before ogl_tex_upload)

GameSetup.cpp: add tex quality mechanism

This was SVN commit r2803.
2005-09-29 05:00:20 +00:00
pyrolink
56257d110e Added changes to interactive minimap so that the camera will stay g_YMinOffset away from terrain it's warped to.
This was SVN commit r2789.
2005-09-28 03:46:05 +00:00
Matei
ff35050d37 This was SVN commit r2725. 2005-09-14 19:43:16 +00:00
janwas
c6215a1451 guirenderer: fix bug that was breaking the ScEd button in main menu. it was calling glEnable/glActiveTextureUnit before ogl_tex_bind, which is now also doing that.
self_test: added another note
wtime: fix evil bug - was casting FILETIME* to u64*, which has different
alignment guarantees.

This was SVN commit r2662.
2005-09-04 19:48:26 +00:00
janwas
9ec828f6fd - both tex.cpp and ogl_tex.cpp had functions named tex_* - confusing. renamed to ogl_tex* to disambiguate.
- ogl_tex_bind now supports multitexturing (avoids need to get id and
then bind manually)
- provide nicer API for querying texture properties (no longer one big
getter). improved GUI determination of texture alpha.
- renderer: another see-if-texture-has-alpha and fixed alpha map code
(wasn't checking if all are same size. only worked because the first map
was larger than the rest

This was SVN commit r2647.
2005-09-02 02:54:02 +00:00
janwas
b4ad393ee4 moved ps/X* to ps/XML/
premake: reflect 2 added and 1 removed source dir
add ps/Util - some helpful functions that were previously in main.cpp

This was SVN commit r2624.
2005-08-14 23:50:37 +00:00
janwas
dc027002c0 host of changes to accommodate Atlas:
- input.cpp allows feeding in events from the outside (will be used by
main.cpp and Atlas msg loop)
- most of main.cpp split into ps/GameSetup.*
- main.cpp is now a "controller" that drives the game via SDL events
(Atlas is another such controller that can override main.cpp). it calls
GameSetup functions to set up and processes messages.
- add functions to import AtlasUI.dll automatically

also, the usual refactoring ;)

This was SVN commit r2622.
2005-08-14 23:34:37 +00:00
janwas
4aa740bff5 - split up lib/res into file, graphics and sound.
- wposix.cpp: initial support for MEM_RESERVE and MEM_COMMIT semantics
in mmap
- cstr: removed no longer necessary serialization header
- xmlutils: wrap new() calls in nommgr/mmgr; allows tracking other
allocs in this file.
- add u64_from_u32
- various minor comments/improvements.

This was SVN commit r2604.
2005-08-12 17:06:53 +00:00
janwas
52ebd6ba11 scripting-interface improvements
- strict param count checks
- use ScriptingHost::RunMemScript instead of copy+pasted code
- replace duplicated parameter access code with macros

StringBuffer: use pointer instead of reference to allow
compiler-generated copy ctor
singleton: fix whitespace

This was SVN commit r2586.
2005-08-09 16:02:15 +00:00
janwas
a69ac0dee9 - fix w4 warnings
- add convenience macros for config_db(CFG_GET_SYS_VAL)
- VFSUtil::EnumDirEnts now uses flags instead of bool recursive
- UNUSED() for params, UNUSED2 (<- need better name) for variables
- config.h defines must be tested with #if (always defined) -> allows
detecting misspellings thanks to compiler warnings
- replace debug_assert(0) with debug_warn (its sole purpose)
- replace ScriptingHost::ValueToInt et al with ToPrimitive
- use nommgr.h to disable both mmgr and VC debug heap

This was SVN commit r2585.
2005-08-09 15:55:44 +00:00
pyrolink
2451e009d1 Added a line that had been somehow deleted and was causing errors.
This was SVN commit r2576.
2005-08-04 23:07:21 +00:00
pyrolink
7fb59c8471 Corrected the minimap's "interactive"/"warp" function so it works on all zooms and rotations.
This was SVN commit r2575.
2005-08-04 08:33:33 +00:00
pyrolink
8ae90b6fdb Corrected the view rectangle for the minimap and added "interactivity" as well (click a point on the minimap, and the camera moves to that spot).
This was SVN commit r2572.
2005-07-31 23:54:19 +00:00
Ykkrosh
a18bb56add Recognise alpha-channel DDS files in GUI
This was SVN commit r2562.
2005-07-29 03:18:41 +00:00
Ykkrosh
c3d42c1025 Fixed mmap bug, and GUI memory leak.
This was SVN commit r2560.
2005-07-28 17:39:27 +00:00
Gee
b1ef166bf3 Added support for customized colors.
This was SVN commit r2547.
2005-07-25 19:06:18 +00:00
Gee
b94c443037 Fixed so that you can have both types of tooltip (other-object 0 delay and pop-up non-zero delay) in the same environment. Haven't tested it that thorough, but hopefully all scenarios are covered.
This was SVN commit r2545.
2005-07-25 05:54:58 +00:00
Gee
f84cfcdf2a Added default to <image size> ("0 0 100% 100%")
This was SVN commit r2543.
2005-07-25 04:48:13 +00:00
Gee
727d2035d3 Changed <icon>'s property 'texture' to 'sprite'. Better late than never. Fixed a bug in the Input rendering code. Minor changes.
This was SVN commit r2539.
2005-07-25 00:52:03 +00:00
Gee
b5f6d19332 Lots of minor updates. Touched up the check-box quite a lot.
This was SVN commit r2532.
2005-07-24 08:29:02 +00:00
Gee
74e1c8a772 Text clipping
This was SVN commit r2527.
2005-07-24 00:01:41 +00:00
Gee
77c0ab074e Someone had renamed a variable to one that already existed in a super-scope, this collided. Fixed it.
i.e. now the selection area is hid again.

This was SVN commit r2526.
2005-07-23 23:22:23 +00:00
Gee
fe087a73f7 Fixed some bugs, updated some things, etc etc
This was SVN commit r2523.
2005-07-23 22:27:55 +00:00
Gee
4d390f501c Heads up, I changed "SelectionChanged" to "SelectionChange" for consistency, it should be read "on selection change", just like "on press".
This was SVN commit r2511.
2005-07-22 03:11:28 +00:00
Gee
abdc96b300 Default value for property 'selected' is now -1, i.e. no selection. Defining this value's default in the default style would be awkward.
This was SVN commit r2505.
2005-07-21 07:34:48 +00:00
Gee
8ebbb0bf35 Added IsRootParent function to check if the absolute property should be ignored or not.
This was SVN commit r2502.
2005-07-20 23:49:39 +00:00
Gee
c3cf031a52 Uncommented list, does anyone know why that has been done anyway? I can't even remember if I've done that or not. Also removed the annoying "Left click has been blocked" error in the log.
This was SVN commit r2498.
2005-07-20 05:27:32 +00:00
Gee
5f15ff3b2d It is now valid for parentless objects to have absolute set to "false", this can be viewed as if the object were the screen's child, i.e., it doesn't matter if absolute is true or false if an object has got no parent, the property is ignored.
This was SVN commit r2495.
2005-07-20 03:52:09 +00:00
Ykkrosh
2ea40a23a3 VS2005 compatibility fixes and warning adjustments:
Updated DLLs.
Added DirectX headers/libraries, since they're not in the platform SDK.
Fixed invalid STL iterator usage.
Disabled STL in stack trace, since it breaks.
Added comments for some reported warnings.
Corrected some apparent off-by-one errors.
Defined strlen_s to strnlen.
Probably broke pre-beta2 versions of VC2005.

This was SVN commit r2454.
2005-07-02 21:42:55 +00:00
janwas
ec6b78b252 rename assert2 debug_assert; use instead of all plain assert(), since there are no longer any issues (e.g. can't use while handling an exception)
This was SVN commit r2447.
2005-06-28 04:06:25 +00:00
olsner
7577d224a6 Terrain XML loading, plus mouse/JS portability and some misc stuff to mix it up
This was SVN commit r2412.
2005-06-20 15:14:36 +00:00
Ykkrosh
92d221f183 Interact.cpp: Use double instead of float for storing absolute times (since the precision is required).
Atlas: Nicer handling of menus.

This was SVN commit r2400.
2005-06-17 23:14:06 +00:00
Ykkrosh
d24fd1b0c9 Use gl*ARB wherever possible. They are mapped onto the core gl* function if the driver's version is high enough, else onto the extension's gl*ARB function.
(Just for fun, compressed texture uploads are mapped onto a
decompression function if the user's system doesn't understand S3TC
textures.)
Corrected (unless I'm wrong) GL version identification logic.

This was SVN commit r2384.
2005-06-14 03:33:16 +00:00
Ykkrosh
4c16658a09 Updated autobuilder to maybe work.
This was SVN commit r2369.
2005-06-02 18:13:38 +00:00
Ykkrosh
b657a1cbca Added CStr and some other things to precompiled.h, to reduce build times.
Altered CStr/UniDoubler's macros, to avoid polluting/conflicting/etc.
Fixed headers in non-PCH builds.
Used the _d version of vorbisfile*.lib in Debug builds.

This was SVN commit r2366.
2005-06-01 20:12:45 +00:00
Ykkrosh
982e051c54 Changed PSERROR to inherit from std::exception
This was SVN commit r2344.
2005-05-24 00:00:40 +00:00
Ykkrosh
21149d9fd0 Renamed translate() to I18n::translate(), to minimise conflicts
This was SVN commit r2334.
2005-05-22 22:58:27 +00:00
olsner
d0f7cb015c - Linux/GCC (as usual :P)
- Ported lockless code to gcc inline assembly
- A few new net messages (gather, attack, add waypoint)
- Support for new messages in network->entity order converter
- Implemented rudimentary JS interface for Interaction
- issueCommand JS API, connected to the network
- Removed Interaction stuff now replaced by JS
- And something in there should probably break VS builds :P

This was SVN commit r2316.
2005-05-18 05:32:09 +00:00
Ykkrosh
7054957514 Minimap: Corrected orientation. Also cleaned up a bit, and fixed some inefficiencies.
Camera: Corrected code that wasn't doing what it looked like it was
doing, and was crashing JS "new Camera".

This was SVN commit r2302.
2005-05-13 01:15:53 +00:00
janwas
fd4eb91e93 debug_out -> debug_printf; MICROLOG moved to ps/Pyrogenesis.h
This was SVN commit r2285.
2005-05-11 18:56:30 +00:00
janwas
8aec300261 fix compile error: #include "GUIText.h" to define CGUIString
This was SVN commit r2175.
2005-04-26 20:29:28 +00:00
janwas
caf6915365 stomped on size() -> int warnings
This was SVN commit r2174.
2005-04-26 20:28:36 +00:00
Gee
4d367109c3 Added GUIList
This was SVN commit r2165.
2005-04-23 23:23:06 +00:00
Gee
15f951bfbc CDropDown and the CGUIList type. This code is kind of rough around the edges as of yet. I'll work on it more.
This was SVN commit r2164.
2005-04-23 23:21:54 +00:00
Gee
15759ff4d7 Updated CList to fit JS interface, also added CDropDown in GUI.h
This was SVN commit r2163.
2005-04-23 23:20:50 +00:00
janwas
04e7b1b16a fix warning (cast size() to int)
This was SVN commit r2149.
2005-04-19 17:02:57 +00:00
Ykkrosh
4c08a07052 Fixed warnings and bug. Updated binaries.
This was SVN commit r2136.
2005-04-15 22:40:15 +00:00
MarkT
2120576bc7 Gathering and unit training (engine-side); also other minor improvements
This was SVN commit r2132.
2005-04-15 04:23:33 +00:00
Gee
1302be8009 This was SVN commit r2116. 2005-04-07 09:14:09 +00:00
Gee
1e8d354404 This was SVN commit r2115. 2005-04-07 09:13:10 +00:00
Ykkrosh
0eb78450c0 Maybe fixed GUI event-handler function things. Other minor changes and fixes.
This was SVN commit r2096.
2005-03-30 22:33:10 +00:00
MarkT
bb7a22f32a First draft of a GPG3-style profiler (including tracing into scripts, after a fashion)
This was SVN commit r2090.
2005-03-30 16:14:19 +00:00
Ykkrosh
9cc11918d3 Fixed small bug in GUI event-handler setting
This was SVN commit r2081.
2005-03-29 23:34:58 +00:00
Ykkrosh
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
Ykkrosh
b58a6339bb Stopped undesirable loading-screen blending
This was SVN commit r2043.
2005-03-24 00:02:54 +00:00
Ykkrosh
ae172a9a01 Disabled mipmaps on GUI textures and cursors
This was SVN commit r1999.
2005-03-17 00:06:51 +00:00
janwas
e6c8cef293 types.h => lib/types.h (avoid name collision)
This was SVN commit r1935.
2005-02-26 15:13:15 +00:00
Ykkrosh
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
olsner
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
olsner
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
janwas
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
janwas
d29833e4ed mouse_x/y => g_mouse_x/y
This was SVN commit r1767.
2005-01-23 17:35:36 +00:00
Ykkrosh
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
olsner
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
Ykkrosh
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
Ykkrosh
37d2d83a9d Adjusted things to work with the new top-down orientation
This was SVN commit r1668.
2005-01-07 14:10:14 +00:00
janwas
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
Ykkrosh
bb8e24ec60 Corrected spelling
This was SVN commit r1637.
2005-01-04 22:07:17 +00:00
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
a61a961edd Don't display blank tooltips
This was SVN commit r1634.
2005-01-04 21:37:51 +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
9e2413acab Allowed \\ in tooltip text. Fixed tooltips.
This was SVN commit r1587.
2004-12-28 13:13:27 +00:00
Ykkrosh
aab60e9ab8 Unbroke text-alignment buffer-zones. Allowed \n in tooltip text.
This was SVN commit r1585.
2004-12-28 12:38:45 +00:00
Ykkrosh
156ff7cf56 Minimal text-alignment ability in Text GUI objects
This was SVN commit r1584.
2004-12-28 12:17:04 +00:00
Ykkrosh
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
Ykkrosh
7e004f07d3 Report zero-sized images as errors.
This was SVN commit r1566.
2004-12-23 23:14:47 +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
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
Ykkrosh
659a9ea57a Initial (incomplete) tooltip code
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
Ykkrosh
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
Ykkrosh
4560c79667 'stretched:' sprites
This was SVN commit r1537.
2004-12-19 14:44:55 +00:00
Ykkrosh
849f50a500 Grayscale effects for GUI sprites
This was SVN commit r1536.
2004-12-19 12:20:04 +00:00
olsner
46f5c61179 Linux/GCC/glibc Compat
This was SVN commit r1532.
2004-12-18 23:30:28 +00:00
Ykkrosh
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
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
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
Ykkrosh
b534e640ca Resource leak fixes
This was SVN commit r1513.
2004-12-16 12:01:47 +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
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
Ykkrosh
6a04509455 Fixed Release-mode compilation
This was SVN commit r1478.
2004-12-09 16:09:58 +00:00
Ykkrosh
e2062ccee1 Faster parsing
This was SVN commit r1477.
2004-12-08 18:15:39 +00:00
Ykkrosh
a2a6f29ab3 s/Prometheus/Pyrogenesis/
This was SVN commit r1459.
2004-12-05 21:56:09 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
olsner
3136791492 Linux/GCC Compat(tm)
This was SVN commit r1284.
2004-11-07 21:30:47 +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
Ykkrosh
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
Ykkrosh
e31edf4fb4 Fixed mouse-wheel zooming
This was SVN commit r1253.
2004-10-17 10:55:57 +00:00
janwas
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
olsner
df1b502bbd Linux Compat and some updated PARANOIA code
This was SVN commit r1189.
2004-09-22 15:20:58 +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
e532b59ead Utilised the corrected CStr8/W conversion
This was SVN commit r1137.
2004-09-06 11:35:42 +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
Ykkrosh
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
Ykkrosh
3b15f3f1e4 Text alignment alterations
This was SVN commit r1119.
2004-09-04 20:35:12 +00:00
Ykkrosh
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
Ykkrosh
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
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
Ykkrosh
c164d9b32c Made buffer-zone consistently a float
This was SVN commit r1114.
2004-09-03 21:37:39 +00:00
Ykkrosh
9b1127d82f Type checking in dangerous pointer-using code
This was SVN commit r1113.
2004-09-03 21:25:39 +00:00
Ykkrosh
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
Ykkrosh
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
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
Ykkrosh
ed9671e8d7 Fixed JS complaints about missing 'prototype'
This was SVN commit r988.
2004-08-14 11:23:38 +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
janwas
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
Ykkrosh
138df056bd Fixed invalid GL code
This was SVN commit r924.
2004-08-06 15:01:23 +00:00
Ykkrosh
1bbb35b204 Variable fonts in the GUI
This was SVN commit r871.
2004-07-31 19:52:15 +00:00
Ykkrosh
520ff37f70 Variable fonts in the GUI
This was SVN commit r858.
2004-07-31 13:37:35 +00:00
Ykkrosh
bbb57ac6db Removed references to font.h
This was SVN commit r856.
2004-07-31 12:44:13 +00:00
Ykkrosh
8b1cec7038 Removed some mildly unpleasant usages of temporary objects
This was SVN commit r852.
2004-07-31 11:29:28 +00:00
Ykkrosh
741699190a Fixed a couple of crashes
This was SVN commit r851.
2004-07-31 11:28:24 +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
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
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
56e41b3003 Yet more fun with errors
This was SVN commit r771.
2004-07-18 11:51:15 +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
8ceb41212d Die more in scripts
This was SVN commit r725.
2004-07-12 15:52: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
268d81ad27 Fixed another memory leak
This was SVN commit r680.
2004-07-10 12:51:35 +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
4c2463d7c3 fix typos in comments :)
This was SVN commit r587.
2004-06-22 17:20:11 +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
olsner
6593bc959b CStr namespace de-pollution; added namespace qualifiers
This was SVN commit r476.
2004-06-11 02:23:00 +00:00
olsner
0983fdcf9c CStr namespace de-pollution; added using namespace to source
This was SVN commit r475.
2004-06-11 02:20:59 +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
8d52add5ea ran newline stomper; no real changes
This was SVN commit r423.
2004-06-08 12:10:51 +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
e511599f8b ADD_TYPE macro: added the extra macro argument used by the code
This was SVN commit r352.
2004-06-02 15:22:53 +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
olsner
35d6803581 VC6 compat removed for gcc compat ;-)
This was SVN commit r345.
2004-06-02 14:29:49 +00:00
janwas
3abf9ac4b5 lots of type fixes; types.h is now a convenience wrapper on top of the standard uintN_t routines
This was SVN commit r334.
2004-06-01 17:34:12 +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
janwas
5b5726ed4d merge of (work in progress) VFS code with new dir layout
This was SVN commit r216.
2004-05-06 17:14:30 +00:00
janwas
af216d3afb minor changes for lib overhaul (some include files from renamed)
This was SVN commit r159.
2004-03-02 23:57:49 +00:00
Gee
a08cbd2f74 vc6 mods
This was SVN commit r144.
2003-12-27 07:23:47 +00:00
Gee
e21ebb37f5 Major updates
This was SVN commit r141.
2003-12-27 06:26:03 +00:00
Gee
8feff097c4 Moved from gui/ to ps/
This was SVN commit r139.
2003-12-27 06:22:28 +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
953f72a91c no message
This was SVN commit r94.
2003-11-25 03:21:11 +00:00
Gee
6d86a928a3 no message
This was SVN commit r92.
2003-11-25 02:47:12 +00:00
olsner
a7b2cfe0fc templated friend declaration with ifdef guards
This was SVN commit r88.
2003-11-25 02:19:00 +00:00
Gee
90bbd48a14 no message
This was SVN commit r77.
2003-11-24 17:13:37 +00:00
Gee
eb2ddf4c50 no message
This was SVN commit r76.
2003-11-24 02:27:04 +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
26b2ca3828 Added doxygen comments
This was SVN commit r66.
2003-11-18 10:00:57 +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
fd1cd7ab28 no message
This was SVN commit r37.
2003-11-06 03:27:20 +00:00