]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
13 years agocheck OpenGL 2.0 version again, rather than supporting fragment shaders
havoc [Fri, 3 Jun 2011 06:40:06 +0000 (06:40 +0000)]
check OpenGL 2.0 version again, rather than supporting fragment shaders
on 1.4, as it's just not performant on these chips and sometimes buggy

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11176 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d3179fa702631ed2c9b45ab21983365dce14def6

13 years agoiqm version 1 compatibility
eihrul [Wed, 1 Jun 2011 11:56:46 +0000 (11:56 +0000)]
iqm version 1 compatibility

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11175 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ba7268e5279ee4f6959883a2789d5abdf8c67a70

13 years agosupport for version 2 of iqm
eihrul [Tue, 31 May 2011 23:19:44 +0000 (23:19 +0000)]
support for version 2 of iqm

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11173 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e72b9d40a0b0bb4f55e3c280d6c2b9b412399ee1

13 years agoUNMERGE! support for version 2 of iqm
eihrul [Tue, 31 May 2011 23:19:44 +0000 (23:19 +0000)]
UNMERGE! support for version 2 of iqm

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11173 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=e72b9d40a0b0bb4f55e3c280d6c2b9b412399ee1

13 years agothe git describe option --dirty is too new, so don't use it
divverent [Wed, 1 Jun 2011 10:47:42 +0000 (10:47 +0000)]
the git describe option --dirty is too new, so don't use it

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11174 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=04cb3d278b366b71d8a088acd2f5ffeb5ac4f448

13 years agosupport for version 2 of iqm
eihrul [Tue, 31 May 2011 23:19:44 +0000 (23:19 +0000)]
support for version 2 of iqm

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11173 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e72b9d40a0b0bb4f55e3c280d6c2b9b412399ee1

13 years agoviewmodel matrix fixes:
divverent [Tue, 31 May 2011 20:25:01 +0000 (20:25 +0000)]
viewmodel matrix fixes:

- have two separate viewmodel matrices, one that only applies the viewmodel
  scale (for EF_NOGUNBOB), and one that contains bobbing etc. effects
- recalculate both matrices properly when using R_SetView() from CSQC
- make sure view parameters are consistent between whether R_SetView() is
  called or not
- fix missing viewmodel scale in intermission

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11172 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=3f8dd70cf524fa42fafddb3dbc9aa64591c2d734

13 years agofix calculation of viewangles to include v_idlescale
divverent [Sun, 29 May 2011 16:56:25 +0000 (16:56 +0000)]
fix calculation of viewangles to include v_idlescale

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11171 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6cc0a6e1e0bf9142cbbf9e5d93264d736fa342cf

13 years agoadded r_trippy cvar
havoc [Sun, 29 May 2011 11:06:42 +0000 (11:06 +0000)]
added r_trippy cvar

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11170 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9c19f5424cd24c82205885ed3d1c75f92f92b2d1

13 years agoreworked sv_gameplayfix_nudgeoutofsolid, it now begins with an enlarged
havoc [Sat, 28 May 2011 17:50:38 +0000 (17:50 +0000)]
reworked sv_gameplayfix_nudgeoutofsolid, it now begins with an enlarged
start position test and nudges out of solids, then does the move, this
should reduce collision issues with triangle mesh brushes in steelstorm,
renamed sv_gameplayfix_nudgeoutofsolid_bias to
sv_gameplayfix_nudgeoutofsolid_separation with 0.03125 as default

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11169 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=25c09ca585e81bf9eb236a339ae5dcd64f63b679

13 years agocall SetDllDirectory on Win32 too
divverent [Fri, 27 May 2011 16:58:46 +0000 (16:58 +0000)]
call SetDllDirectory on Win32 too

Usage: put DLLs in a bin32/ subdir for that
If not done, binaries work as before.

This is the only way to have a 32bit and 64bit executable version in the same
directory! Otherwise Windows will abort DLL search at the 32bit DLL, which
fails to load into a 64bit process.

NOTE: this requires WinXP SP1 and above. To compile with this functionality
disabled, compile with -DDONT_USE_SETDLLDIRECTORY added to the CFLAGS.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11168 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=fc8e8ca74dbb1cf8729e193ae25652daea9416a8

13 years agoapply vid_sRGB correction to viewblends and particles
havoc [Fri, 27 May 2011 07:44:27 +0000 (07:44 +0000)]
apply vid_sRGB correction to viewblends and particles

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11167 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bebdddd7765df0b347089323bad3a5ae626f7822

13 years agor_speeds now shows without being connected (in menu for example),
havoc [Wed, 25 May 2011 01:46:42 +0000 (01:46 +0000)]
r_speeds now shows without being connected (in menu for example),
showfps also does

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11166 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=dcfd91cf606568faf86a1826496f9f86927c45af

13 years agofix bugs with deformvertexes autosprite in GL11/GL13/GLES1 paths
havoc [Wed, 25 May 2011 01:13:13 +0000 (01:13 +0000)]
fix bugs with deformvertexes autosprite in GL11/GL13/GLES1 paths

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11165 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=fb3d2ae44bef169636365338609174217fdf89cb

13 years agohonor ent->shadertime in all material handling (tcmod, etc)
havoc [Mon, 23 May 2011 15:49:45 +0000 (15:49 +0000)]
honor ent->shadertime in all material handling (tcmod, etc)
do frame looping properly on q3 shader animmap (no more precision issues)
wrap tcmod scroll so that it does not have precision breakdown
changed rsurface.ent_shadertime to rsurface.shadertime which is now
relative time (what should be used)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11164 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=413d0b4aa169829f1c464b2bcde781972af138a2

13 years agoadded LoopingFrameNumberFromDouble function to do this operation
havoc [Mon, 23 May 2011 15:46:32 +0000 (15:46 +0000)]
added LoopingFrameNumberFromDouble function to do this operation
correctly (using divide, floor, and multiply), since doing it the lazy
way (cast to int, use modulus operator) breaks down after a certain
amount of time in the level

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11163 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6bb2c4cecb8a4e633fc0faf90c939fc180f7163b

13 years agofix a crash in debug builds where the compiler did not optimize
havoc [Mon, 23 May 2011 09:41:52 +0000 (09:41 +0000)]
fix a crash in debug builds where the compiler did not optimize
ch->sfx-> to use a local variable holding the unchanging value of sfx
(the crash occurs when the mixer thread clears ch->sfx while the main
thread is deciding whether to merge a sound onto an existing channel -
if the channel dies during this code, the sfx pointer must be preserved)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11161 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b812f1cdbdd266c770423017f47a129e64811cf0

13 years agofix steelstorm animated shader timing (shadertime was not declared in
havoc [Mon, 23 May 2011 11:08:46 +0000 (11:08 +0000)]
fix steelstorm animated shader timing (shadertime was not declared in
this csprogs.dat and the old code checked for that, no longer possible)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11162 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9ae45aa38830d74344ac5d7a959788a2d89b5a6f

13 years agoMove some sprite-related cvars to model_sprite.c.
vortex [Sat, 21 May 2011 16:59:30 +0000 (16:59 +0000)]
Move some sprite-related cvars to model_sprite.c.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11160 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8db36146f598c50f57d2f8dd60f69a64fe15e8d5

13 years agoadd precache_cubemap() builtin
vortex [Fri, 20 May 2011 20:28:46 +0000 (20:28 +0000)]
add precache_cubemap() builtin

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11159 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=eceb4d03fd1de4078f3056fbde91ea55ffe5393d

13 years agoAdded "loadcubemap" builtin to allow preload cubemaps level can use, added experiment...
vortex [Fri, 20 May 2011 20:27:10 +0000 (20:27 +0000)]
Added "loadcubemap" builtin to allow preload cubemaps level can use, added experimental "r_water_lowquality" which reduces options while rendering water planes, this can help a bit. Added "gl_texturecompression_sprites" cvar.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11158 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4e08e20e6bfbd53bb1796e8de40d261bbfd0e7c3

13 years agoadded JOY_UP/DOWN/LEFT/RIGHT keys which are a more general form of the joy_axiskeyeve...
havoc [Thu, 19 May 2011 01:33:42 +0000 (01:33 +0000)]
added JOY_UP/DOWN/LEFT/RIGHT keys which are a more general form of the joy_axiskeyevents cvar (which when set to 1 will turn these into UPARROW/DOWNARROW/etc as before, but this way a menu qc can respond to them correctly)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11157 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=db717d093453e95a1fc005d7c884b12562d7ca9f

13 years agoXInput code path no longer emulates arrow keys in menu by default, instead this is...
havoc [Thu, 19 May 2011 01:21:10 +0000 (01:21 +0000)]
XInput code path no longer emulates arrow keys in menu by default, instead this is based purely on the joy_axiskeyevents cvar (and no longer cares if it is the menu or not)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11156 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d6070bce95a76039af1a5073b0fed22efab34bae

13 years agodisable VorteX's multisample setup code because it crashes vid_restart
havoc [Wed, 18 May 2011 13:32:46 +0000 (13:32 +0000)]
disable VorteX's multisample setup code because it crashes vid_restart
and looks like it does not work anyway

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11155 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6551bfc9535e8b62c0c567500948d44b8da6acbe

13 years agodon't crash in dedicated server when parsing shaders with dpreflectcube
havoc [Sat, 14 May 2011 17:58:56 +0000 (17:58 +0000)]
don't crash in dedicated server when parsing shaders with dpreflectcube

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11151 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e356fe45dd489969d894461876d1701bb02e79f9

13 years agoMultisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array...
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e272f5efe910b09242dd42c4044aa85bfe9b1710

13 years agoimplemented support for Windows XInput (using different keys/cvars to allow non-confl...
havoc [Wed, 18 May 2011 13:18:43 +0000 (13:18 +0000)]
implemented support for Windows XInput (using different keys/cvars to allow non-conflicting configs) in vid_shared.c, usable in WGL and SDL clients on Windows
redesigned joystick code to encode any joystick data into a vid_joystate_t struct and use a common code path for all handling of axes and button events (also rewrote joy_axiskeyevents as part of this)
changed joystick deadzone handling to make values start at 0 at the edge of the deadzone
removed legacy joystick code in vid_wgl.c because it was too annoying to maintain
removed some hacky SDL 1.3 iOS code that is no longer needed

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11154 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=5737591d891d69836735abb645a1b173baaabe96

13 years agofix a bug where the wrong PRVM_ macro was being used
havoc [Wed, 18 May 2011 13:08:01 +0000 (13:08 +0000)]
fix a bug where the wrong PRVM_ macro was being used

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11153 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2625b75211299dbaff3e97e4d864e3b67117048a

13 years agoUNMERGE! Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps...
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
UNMERGE! Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=e272f5efe910b09242dd42c4044aa85bfe9b1710

13 years agoUNMERGE! don't crash in dedicated server when parsing shaders with dpreflectcube
havoc [Sat, 14 May 2011 17:58:56 +0000 (17:58 +0000)]
UNMERGE! don't crash in dedicated server when parsing shaders with dpreflectcube

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11151 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=e356fe45dd489969d894461876d1701bb02e79f9

13 years agonew movement cvar and stat: sv_airaccel_qw_stretchfactor
divverent [Tue, 17 May 2011 18:12:08 +0000 (18:12 +0000)]
new movement cvar and stat: sv_airaccel_qw_stretchfactor

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11152 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a4618343baeaeef9413feb24b515866f6341baca

13 years agoadded prvm_offsets.h which centralizes field/global/function lookups for
havoc [Mon, 9 May 2011 20:20:37 +0000 (20:20 +0000)]
added prvm_offsets.h which centralizes field/global/function lookups for
easier maintenance, this file is included with a huge set of macros for
each different purpose...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11145 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8c6898ab1f01b8efd78fea454b3f8654c4265ebb

13 years agoreworked PRVM_EDICTFIELD* and PRVM_GLOBALFIELD* usage to have more
havoc [Mon, 9 May 2011 17:56:56 +0000 (17:56 +0000)]
reworked PRVM_EDICTFIELD* and PRVM_GLOBALFIELD* usage to have more
specific naming of the macros, and allow code analysis to audit the used
fields/globals for better maintenance

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11144 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e660b4c0147da9f4b5db110a05cfbadcea6b1b64

13 years agodon't crash in dedicated server when parsing shaders with dpreflectcube
havoc [Sat, 14 May 2011 17:58:56 +0000 (17:58 +0000)]
don't crash in dedicated server when parsing shaders with dpreflectcube

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11151 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e356fe45dd489969d894461876d1701bb02e79f9

13 years agoMultisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array...
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e272f5efe910b09242dd42c4044aa85bfe9b1710

13 years agoA temporary hack for GAME_XONOTIC only
divverent [Sat, 14 May 2011 16:16:08 +0000 (16:16 +0000)]
A temporary hack for GAME_XONOTIC only

this commit adds getplayerkey(..., "TEMPHACK_origin") to get a networked
player's origin from csqc; it returns the empty string if the extension is not
supported, or the player is not known to the engine at the moment

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11150 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=7d5e9ee47b468b101a0bdd121de972fdb4bca801

13 years agoUNMERGE! Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps...
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
UNMERGE! Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=e272f5efe910b09242dd42c4044aa85bfe9b1710

13 years agoadd a missing declaration in last commit
divverent [Sat, 14 May 2011 13:06:28 +0000 (13:06 +0000)]
add a missing declaration in last commit

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11149 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6a03c89272a7193c133db45d45e22a223342a861

13 years agoAttempt to make loading screens not stay cached, to avoid loading GPU memory when...
divverent [Sat, 14 May 2011 13:03:44 +0000 (13:03 +0000)]
Attempt to make loading screens not stay cached, to avoid loading GPU memory when having high resolution loading images.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11148 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0b4cff287c2e7d621f0ed198c6e00f976dbf8d31

13 years agoMultisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array...
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e272f5efe910b09242dd42c4044aa85bfe9b1710

13 years agoOpenGL 2.0 path: Make handling of Alpha-To-Coverage same as AlphaTest (enabling befor...
vortex [Wed, 11 May 2011 22:59:39 +0000 (22:59 +0000)]
OpenGL 2.0 path: Make handling of Alpha-To-Coverage same as AlphaTest (enabling before surface render and disabling after), instead of hacky R_ShadowMode_Begin force-to-disable, this also fixes shadowmap bug with ATI hardware. Also made vid_multisampling (if enabled) to force minimal vid_samples 2.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11146 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=414e08ab14df747e51896a7e437401741470205a

13 years agoadded pmove_onground to get this value from the engine prediction
havoc [Mon, 9 May 2011 15:44:40 +0000 (15:44 +0000)]
added pmove_onground to get this value from the engine prediction
added pmove_inwater to get this value from the engine prediction

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11143 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e0d72a97bea6a4f2af3bf0fffefe428650bac8b4

13 years agofix missing .string message fielddef
havoc [Mon, 9 May 2011 13:35:35 +0000 (13:35 +0000)]
fix missing .string message fielddef

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11142 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=11df435654c96dd18d622b68ab2a819584555b95

13 years agoadd the prvm_badvalue variable needed by the last commit
havoc [Mon, 9 May 2011 13:35:20 +0000 (13:35 +0000)]
add the prvm_badvalue variable needed by the last commit

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11141 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=547992e433dfac23e1d5e6ff91f4e44335164e70

13 years agoadded debugging code for PRVM_EDICTFIELD*/PRVM_GLOBALFIELD* macros,
havoc [Mon, 9 May 2011 13:32:31 +0000 (13:32 +0000)]
added debugging code for PRVM_EDICTFIELD*/PRVM_GLOBALFIELD* macros,
these now warn if the fieldoffset is invalid, and do not crash

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11140 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=01fb45d86cd8443142099a9b3064c26908ba3c69

13 years agoMove Alpha-To-Coverage stuff to gl_backend.c, fix bug with shadows rendering.
vortex [Mon, 9 May 2011 11:28:12 +0000 (11:28 +0000)]
Move Alpha-To-Coverage stuff to gl_backend.c, fix bug with shadows rendering.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11139 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=20cff5b6fe91a72c3ed5d287cfb73e51e2ab350d

13 years agofix a crash
havoc [Sun, 8 May 2011 22:52:32 +0000 (22:52 +0000)]
fix a crash

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11138 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=aff7b9f6daa22f434d25c50a984abebad71a4f22

13 years agofix another warning
havoc [Sun, 8 May 2011 19:51:49 +0000 (19:51 +0000)]
fix another warning

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11131 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=912fc8ebf5b77692efc450e89545420e5b3e6ad5

13 years agofix a C++ compile error
havoc [Sun, 8 May 2011 19:49:05 +0000 (19:49 +0000)]
fix a C++ compile error

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11130 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=19370b494c664501e846a704f007e86d416dd382

13 years agoa few more PRVM_EDICTFIELDVALUE/PRVM_GLOBALFIELDVALUE uses fixed
havoc [Sun, 8 May 2011 18:37:26 +0000 (18:37 +0000)]
a few more PRVM_EDICTFIELDVALUE/PRVM_GLOBALFIELDVALUE uses fixed

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11129 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ab5ec6e843efaaa298f6661cf398ac9ed79f61b0

13 years agoremoved NULL checks for PRVM_EDICTFIELDVALUE/GLOBALFIELDVALUE
havoc [Sun, 8 May 2011 18:34:47 +0000 (18:34 +0000)]
removed NULL checks for PRVM_EDICTFIELDVALUE/GLOBALFIELDVALUE
added PRVM_EDICTFIELDFLOAT/VECTOR/STRING/EDICT/FUNCTION variants
added PRVM_GLOBALFIELDFLOAT/VECTOR/STRING/EDICT/FUNCTION variants
this should improve performance slightly, and make code audits easier
updated required fields lists, added required globals lists

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11128 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9e0b57e36ca8bb835c2f49901b4493b1f3b5625a

13 years agoGL_ARB_multisampling defs (vid_multisampling) and alpha-to-coverage effect (r_transpa...
vortex [Sun, 8 May 2011 21:55:18 +0000 (21:55 +0000)]
GL_ARB_multisampling defs (vid_multisampling) and alpha-to-coverage effect (r_transparent_alphatocoverage) for alphaTest surfaces, which dont use multisampling yet but looks better for most cases, especially for overhead games.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11136 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f7b0c61e168f52b255e42a9cf26e87bf7be6fc41

13 years agofixed RF_VIEWMODEL really good this time
havoc [Sun, 8 May 2011 13:49:35 +0000 (13:49 +0000)]
fixed RF_VIEWMODEL really good this time
renamed cl.csqc_origin to cl.csqc_vieworigin, cl.csqc_angles to
cl.csqc_viewangles, and added cl.csqc_vieworiginfromengine and
cl.csqc_viewanglesfromengine which are used to restore the view
parameters when R_ClearScene is used in csqc

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11123 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a1eb88e8cd541ac340c36fb31d9dfa85cf181c4c

13 years agofix bug in last patch, fix RF_USEAXIS handling
havoc [Sun, 8 May 2011 13:16:54 +0000 (13:16 +0000)]
fix bug in last patch, fix RF_USEAXIS handling

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11122 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6ca878eac347c3d744ac078de95fcb17a2af5d34

13 years agofix RF_VIEWMODEL by using CL_GetTagMatrix on self rather than
havoc [Sun, 8 May 2011 12:56:22 +0000 (12:56 +0000)]
fix RF_VIEWMODEL by using CL_GetTagMatrix on self rather than
self.tag_entity

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11121 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6b9d903de3ec0ac28f43f18e2df4ab7b09cbf1d5

13 years agoadded vid_sRGB cvar, this replaces the r_texture_sRGB* cvars and
havoc [Sat, 7 May 2011 12:36:28 +0000 (12:36 +0000)]
added vid_sRGB cvar, this replaces the r_texture_sRGB* cvars and
modifies all texture loading (including bsp, mdl, spr, lmp, as well as
external textures) and the output gamma to achieve sRGB corrected
rendering, not all renderpaths support this and the feature will be
automatically disabled on such renderpaths

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11116 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=72febe336719285ecd4f855454d1e90f7aa99834

13 years agomac builds now detect if the gamedir exists in the .app/Contents/Resources/ folder
havoc [Sun, 8 May 2011 22:28:44 +0000 (22:28 +0000)]
mac builds now detect if the gamedir exists in the .app/Contents/Resources/ folder

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11137 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bb696fef79b956b09b2f6766e7c87ac364ecceae

13 years agofix naming of two fields
divverent [Sun, 8 May 2011 15:25:44 +0000 (15:25 +0000)]
fix naming of two fields

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11127 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b6b3148dd653325f5018c5911f44c23bbf8be477

13 years agofix parsing in more places
divverent [Sun, 8 May 2011 15:21:45 +0000 (15:21 +0000)]
fix parsing in more places

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11126 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=158c9fb4b171a8e882990dbd053e9e7b0cbc60d0

13 years agoadd a compare tool for dpdefs (not really complete!)
divverent [Sun, 8 May 2011 15:17:06 +0000 (15:17 +0000)]
add a compare tool for dpdefs (not really complete!)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11125 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=34833b7339f862a01d8ebbcfc09aaacc72c7d202

13 years agofix annotation of crypto fields
divverent [Sun, 8 May 2011 14:42:45 +0000 (14:42 +0000)]
fix annotation of crypto fields

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11124 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=c0f42e72f17f507c2bc30e6ffb5a451dc4b825d6

13 years agofix double declarations of ODE stuff
divverent [Sun, 8 May 2011 11:25:14 +0000 (11:25 +0000)]
fix double declarations of ODE stuff

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11120 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=3391ad2a68814b35f3306b82fc021acd34660d61

13 years agoadd buttons 9 to 16; improve autocvar description
divverent [Sat, 7 May 2011 21:00:32 +0000 (21:00 +0000)]
add buttons 9 to 16; improve autocvar description

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11119 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0bdf3059605a8120e12808f5f400922b39bea57a

13 years agofix water renders with r_viewscale
divverent [Sat, 7 May 2011 16:12:22 +0000 (16:12 +0000)]
fix water renders with r_viewscale

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11118 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=00a8efb624833e1aba894b6665c4fd7d8bd8fa84

13 years agotry harder to get a version string out of git
divverent [Sat, 7 May 2011 15:21:57 +0000 (15:21 +0000)]
try harder to get a version string out of git

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11117 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=7a2ff0cd57402211c207a405d85d6c7d40e2c637

13 years agolovely untested OSX code for detecting gamedir inside .app
havoc [Sun, 8 May 2011 21:02:54 +0000 (21:02 +0000)]
lovely untested OSX code for detecting gamedir inside .app

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11135 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=52e0ce1d000e4326978840aff6a4cb3c0a19df6c

13 years agodon't bother using GL_ARB_texture_non_power_of_two on OSX, too buggy
havoc [Sun, 8 May 2011 21:02:21 +0000 (21:02 +0000)]
don't bother using GL_ARB_texture_non_power_of_two on OSX, too buggy

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11134 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=157cb585d7c32162a9b842361603d776afc78e8c

13 years agorenabe builtin particle->spawnparticle (DP_CSQC_SPAWNPARTICLE) because it conflicts...
vortex [Sun, 8 May 2011 20:33:48 +0000 (20:33 +0000)]
renabe builtin particle->spawnparticle (DP_CSQC_SPAWNPARTICLE) because it conflicts with quake's particle().

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11133 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=71c47f87ec7e26b5d851978ca828c76a22e0ef59

13 years agoupdated to SDL1.2.14 version of OSX main code
havoc [Sun, 8 May 2011 20:23:04 +0000 (20:23 +0000)]
updated to SDL1.2.14 version of OSX main code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11132 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6be2c9fbde1260b0665bf0b3a548e6e9976367a1

13 years agoadd 2 missing casts
divverent [Fri, 6 May 2011 20:56:35 +0000 (20:56 +0000)]
add 2 missing casts

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11115 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0b21c729f7b68ebc477c7f924771c7af8cd960e0

13 years agowe can enable NPOT fonts, there seems to be no slowdown from it
divverent [Fri, 6 May 2011 19:31:50 +0000 (19:31 +0000)]
we can enable NPOT fonts, there seems to be no slowdown from it

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11114 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=feb6b127336d86a5160baae639d3d65edcfeba04

13 years agonew cvar: r_font_nonpoweroftwo (to save GPU VRAM for fonts)
divverent [Fri, 6 May 2011 18:34:10 +0000 (18:34 +0000)]
new cvar: r_font_nonpoweroftwo (to save GPU VRAM for fonts)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11113 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b4e6e00b1b6188b776ac66003d00bf23ff0fb5b5

13 years agoadd a debug print about font map use
divverent [Fri, 6 May 2011 18:33:35 +0000 (18:33 +0000)]
add a debug print about font map use

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11112 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f0bfa0b0304f429514f40f60311a345ee11ae200

13 years agoFINALLY use the mapidx right
divverent [Fri, 6 May 2011 18:33:10 +0000 (18:33 +0000)]
FINALLY use the mapidx right

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11111 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=14995903ebaf5a8b732809530b42cb2291e61bad

13 years agoto resolve the format string madness once and for all: write explicit casts for all...
divverent [Fri, 6 May 2011 18:32:45 +0000 (18:32 +0000)]
to resolve the format string madness once and for all: write explicit casts for all args in this printf

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11110 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=40855ff3b420e5fd179f4e3b64ac51acdef3509a

13 years agoadded .float sendcomplexanimation server qc field which if TRUE will
havoc [Fri, 6 May 2011 13:39:22 +0000 (13:39 +0000)]
added .float sendcomplexanimation server qc field which if TRUE will
send .frame .frame2 .frame3 .frame4 .frame1time .frame2time .frame3time
.frame4time .lerpfrac .lerpfrac3 .lerpfrac4 OR .skeletonindex if set
(BANDWIDTH HOG, skeletal networking inadvisable in multiplayer)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11109 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=fc9f3eecc683677641ba6f44a678ec36e33ee013

13 years agofix a format error in map_identifier (load_flags needs to be u, not g)
havoc [Fri, 6 May 2011 13:05:29 +0000 (13:05 +0000)]
fix a format error in map_identifier (load_flags needs to be u, not g)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11108 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e1566b77c280f0fb9c0961c11db24c4d9ddfd3c3

13 years agofix bug with iqm models by removing pose 0 optimization (as it
havoc [Fri, 6 May 2011 09:08:29 +0000 (09:08 +0000)]
fix bug with iqm models by removing pose 0 optimization (as it
represents the basepose in iqm, not the first pose)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11107 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ffd378fd3933a6805ee561413d08d6201880a298

13 years agoRemoved mqt_viewmindist as it messes up order and don't give much.
vortex [Wed, 4 May 2011 21:08:05 +0000 (21:08 +0000)]
Removed mqt_viewmindist as it messes up order and don't give much.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11104 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=c9b9e2d6bd061e255c0418b44f8ec3e251642c16

13 years agofix serious error in font caching
havoc [Thu, 5 May 2011 11:49:33 +0000 (11:49 +0000)]
fix serious error in font caching

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11106 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1c86aa2d2f97679d7567dc3540657e5349f0e0ba

13 years agoavoid creating an empty config.cfg in the basedir folder unless doing
havoc [Thu, 5 May 2011 03:44:49 +0000 (03:44 +0000)]
avoid creating an empty config.cfg in the basedir folder unless doing
the historical compatibility mode (only for id1 on Windows)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11105 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=750ec66e97f390a28450dad797a59945e443daa4

13 years agoavoid rendering the glyphs when not needed
divverent [Wed, 4 May 2011 05:02:10 +0000 (05:02 +0000)]
avoid rendering the glyphs when not needed

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11103 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1baef5c2e19962f55e01fc5c00a15aa70737bed5

13 years agofree the data allocated by font rendering, even if the image is not to be used
divverent [Wed, 4 May 2011 05:02:07 +0000 (05:02 +0000)]
free the data allocated by font rendering, even if the image is not to be used

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11102 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4f09c5de78d1b37e4ec7cb2cd1b6016db5bce56f

13 years agoalso calculate padding if the font glyph is not to be rendered
divverent [Wed, 4 May 2011 05:02:04 +0000 (05:02 +0000)]
also calculate padding if the font glyph is not to be rendered

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11101 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b30fb3a7cf56e7e1b78a4de82202ee225edd705b

13 years agoadd a third mode to call Font_Postprocess (NULL image, but pitch set)
divverent [Wed, 4 May 2011 05:02:02 +0000 (05:02 +0000)]
add a third mode to call Font_Postprocess (NULL image, but pitch set)

This performs the same padding calculation as if the image were set, but does not actually process

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11100 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=980d966f02dac2e06074d6538a57eb718d093505

13 years agofix screenshot prefix updates on gamedir change
havoc [Tue, 3 May 2011 18:33:50 +0000 (18:33 +0000)]
fix screenshot prefix updates on gamedir change

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11099 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b1ff17a02ba9bea34175b1fe914539aa08148697

13 years agofix loading of quake lmp/wad textures
havoc [Tue, 3 May 2011 18:03:22 +0000 (18:03 +0000)]
fix loading of quake lmp/wad textures

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11098 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=97d3f3a9721b9a5e696adb4262e7d3b3964ef892

13 years agogl_texturecompression is no longer required for TEXF_COMPRESS flag to
havoc [Tue, 3 May 2011 17:41:59 +0000 (17:41 +0000)]
gl_texturecompression is no longer required for TEXF_COMPRESS flag to
work - this cvar is now checked by the callers, so r_font_compress is
independent of it now
added r_texture_dds_save 2 setting which saves dds files even for
uncompressed textures, allowing one to completely skip source art files

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11097 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=be26fc71ecb2980b8a33ada15c06545cc5b52784

13 years agoavoid bugs introduced by the attempt to skip image processing - a closer
havoc [Tue, 3 May 2011 13:34:49 +0000 (13:34 +0000)]
avoid bugs introduced by the attempt to skip image processing - a closer
look is needed

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11096 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2c92bb5623c37c0fcbc64e6d3a6e6a3febc9ce5b

13 years agodon't upload the same ft2 font texture more than once
havoc [Tue, 3 May 2011 11:42:49 +0000 (11:42 +0000)]
don't upload the same ft2 font texture more than once
added r_font_diskcache (can read/write tga and dds)
added r_font_compress (saves memory by compressing the texture)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11095 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=86084b10a110d8398e08c28223327ba07757f649

13 years agocheck GL_ARB_fragment_shader
havoc [Tue, 3 May 2011 07:57:10 +0000 (07:57 +0000)]
check GL_ARB_fragment_shader

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11094 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d8742b10c4cda0a0f31a6a0a2325d7bcab0d791b

13 years agoreworked GL shader detection a bit, now works on Mac with Intel GMA 945 again
havoc [Tue, 3 May 2011 07:29:39 +0000 (07:29 +0000)]
reworked GL shader detection a bit, now works on Mac with Intel GMA 945 again

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11093 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e9e34678e4c1e363fafdfe4eaed2e26b5e833ae1

13 years agofix two compile errors in C++ mode
havoc [Tue, 3 May 2011 00:59:44 +0000 (00:59 +0000)]
fix two compile errors in C++ mode

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11092 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6b204d1e2c6cf188ec0011e30be82a83c2d156e7

13 years agofix two bugs with the Windows handling of GAMEDIRMODE_SAVEDGAMES, it now works properly
havoc [Tue, 3 May 2011 00:59:01 +0000 (00:59 +0000)]
fix two bugs with the Windows handling of GAMEDIRMODE_SAVEDGAMES, it now works properly

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11091 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ccb7a250d36552a62dd9abbe9b9fc87853d9cba2

13 years agoTransparent sorting: added maxdist and array size cvars which can be tweaked to incre...
vortex [Mon, 2 May 2011 02:09:59 +0000 (02:09 +0000)]
Transparent sorting: added maxdist and array size cvars which can be tweaked to increase performance (can give up to 10-20% with no quality loss on scenes with large amount of blended surfaces). Added "dpnortlight" shader keyword which disables full rtlight rendering on a surface, useful with grass which (when blended) can cause deadly speed loss.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11090 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ec581e708c6874f1e1fa64343421683fd16f8609

13 years agoshells are too stupid to understand precedence of && and ||, so let's group explicitly
divverent [Sun, 1 May 2011 20:24:33 +0000 (20:24 +0000)]
shells are too stupid to understand precedence of && and ||, so let's group explicitly

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11089 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e1561444a7528d17961958a23bf9bc64007c8355

13 years agofix a compile error in my last edit for OSX
havoc [Sun, 1 May 2011 20:23:49 +0000 (20:23 +0000)]
fix a compile error in my last edit for OSX

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11088 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2c92309825604df1e7426f73c2900508386db419

13 years agodon't override dock icon on OSX
havoc [Sun, 1 May 2011 20:05:17 +0000 (20:05 +0000)]
don't override dock icon on OSX

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11087 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=63f8870823e80484fe6e58a3738c2e681860c7f1

13 years agodetect git revision too, not just svn version
divverent [Sun, 1 May 2011 18:58:04 +0000 (18:58 +0000)]
detect git revision too, not just svn version

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11086 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=47bafbe6c0835c18460b27d121c0a879ac1f3940

13 years agoreworked userdir path selection, now has 4 "tiers":
havoc [Sun, 1 May 2011 16:33:10 +0000 (16:33 +0000)]
reworked userdir path selection, now has 4 "tiers":
NOHOME - uses basedir for configs
HOME - uses basedir on Windows, ~/.gamename/ on OSX and Linux
MYGAMES - uses My Games on Windows, ~/.gamename/ on Linux and OSX
SAVEDGAMES - uses Saved Games/gamename/ on Vista+, ~/.gamename/ on Linux
and ~/Library/Application Support/gamename/ on OSX
The tiers are tried in reverse order and any existing one will be used,
new ones will always be the last one.
If gamedirname1 is "id1" then Windows will use NOHOME rather than create
a new userdir when none are found. (but you can still create one or use
-mygames or -savedgames commandline options to make it do so)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11085 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ebcf972cfa9c79f263fd0ca752d90fa2b2614521