]> de.git.xonotic.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
13 years agooffsetmapping: make it work on ATI Radeon 9500-9800/X300 again
divverent [Sat, 30 Oct 2010 18:19:38 +0000 (18:19 +0000)]
offsetmapping: make it work on ATI Radeon 9500-9800/X300 again

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

13 years agooops, video texture unlinking was accidentally removed, restore it
vortex [Fri, 29 Oct 2010 17:54:59 +0000 (17:54 +0000)]
oops, video texture unlinking was accidentally removed, restore it

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

13 years agocvar "cl_video_keepaspectratio" which scales fullscreen video to keep original aspect...
vortex [Fri, 29 Oct 2010 17:50:35 +0000 (17:50 +0000)]
cvar "cl_video_keepaspectratio" which scales fullscreen video to keep original aspect ratio on widescreen resolutions

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

13 years agofix some warnings
divverent [Fri, 29 Oct 2010 20:19:14 +0000 (20:19 +0000)]
fix some warnings

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

13 years agoadd a "dummy protocol" support
divverent [Fri, 29 Oct 2010 20:19:10 +0000 (20:19 +0000)]
add a "dummy protocol" support

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

13 years agoI suppose 0xE000 is a valid fontmap char... so render it as charmap item 0
divverent [Fri, 29 Oct 2010 14:30:24 +0000 (14:30 +0000)]
I suppose 0xE000 is a valid fontmap char... so render it as charmap item 0

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

13 years agodon't translate \0 to \uE000 when receiving that keycode (as it simply is a nonprinta...
divverent [Fri, 29 Oct 2010 14:27:07 +0000 (14:27 +0000)]
don't translate \0 to \uE000 when receiving that keycode (as it simply is a nonprintable key then)

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

13 years agofix one issue with textshadow moving oddly around in an unknown situation
divverent [Fri, 29 Oct 2010 14:25:45 +0000 (14:25 +0000)]
fix one issue with textshadow moving oddly around in an unknown situation

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

13 years agoFix nasty bug with dp_fonts structure expanding, once dp_fonts.f being reallocated...
vortex [Fri, 22 Oct 2010 21:56:14 +0000 (21:56 +0000)]
Fix nasty bug with dp_fonts structure expanding, once dp_fonts.f being reallocated, their corresponding ft2 settings links was messed up causing crash or postprocess to be lost.

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

13 years agoadded GAME_MOONHELM
havoc [Fri, 22 Oct 2010 18:49:53 +0000 (18:49 +0000)]
added GAME_MOONHELM

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

13 years agonew .gitattributes file, no visible change
divverent [Thu, 21 Oct 2010 16:11:33 +0000 (16:11 +0000)]
new .gitattributes file, no visible change

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

13 years agofix in entity teleport detection of FlyMove
divverent [Tue, 19 Oct 2010 19:13:39 +0000 (19:13 +0000)]
fix in entity teleport detection of FlyMove

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

13 years agonew r_stereo modes (horiz and vert split)
divverent [Tue, 19 Oct 2010 13:45:22 +0000 (13:45 +0000)]
new r_stereo modes (horiz and vert split)

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

13 years agomake getsurface* not animate vertices if the model is not animated
divverent [Tue, 19 Oct 2010 06:24:42 +0000 (06:24 +0000)]
make getsurface* not animate vertices if the model is not animated

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

13 years agoas the SSE bug seems fixed now, use SSE in MSVC builds now too again
divverent [Mon, 18 Oct 2010 20:27:16 +0000 (20:27 +0000)]
as the SSE bug seems fixed now, use SSE in MSVC builds now too again

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

13 years agoexperimental: do not auto allocate a skeletonobject when a CSQC model just uses frame...
divverent [Mon, 18 Oct 2010 07:29:59 +0000 (07:29 +0000)]
experimental: do not auto allocate a skeletonobject when a CSQC model just uses frame based animation (NOTE: this MAY even cause crashes, please test, I just can't find any case where that object is really required); this moves blending of frame based animations back into Mod_Skeletal_AnimateVertices again (if this commit causes worse performance, a different course of action may be reverting it, and making sure a skeletonobject is ALWAYS created, even for SVQC managed legacy entities)

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

13 years agonew r_stereo modes (horiz and vert split)
Rudolf Polzer [Tue, 19 Oct 2010 10:17:05 +0000 (12:17 +0200)]
new r_stereo modes (horiz and vert split)

13 years agofix a Mem_Free(NULL) warning
divverent [Mon, 18 Oct 2010 07:29:44 +0000 (07:29 +0000)]
fix a Mem_Free(NULL) warning

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

13 years agofix a crash in R_CompleteLightPoint during rtworld sampling
vortex [Mon, 18 Oct 2010 01:26:27 +0000 (01:26 +0000)]
fix a crash in R_CompleteLightPoint during rtworld sampling

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

13 years agoProperly unlink video texture and suspend videos on r_restart, so they actually survi...
vortex [Mon, 18 Oct 2010 01:07:41 +0000 (01:07 +0000)]
Properly unlink video texture and suspend videos on r_restart, so they actually survive it.

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

13 years agoR_CompleteLightPoint bugfixed, dynamic lights actually matter for lit particles,...
vortex [Mon, 18 Oct 2010 00:47:19 +0000 (00:47 +0000)]
R_CompleteLightPoint bugfixed, dynamic lights actually matter for lit particles, lit sprites now sample lightning from rtlights and dlights instead of just lightgrid (by using R_CompleteLightPoint).

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

13 years agoFix sprites whose name begins from ! (assumed lit sprites) to be actually lit with...
vortex [Sun, 17 Oct 2010 22:26:24 +0000 (22:26 +0000)]
Fix sprites whose name begins from ! (assumed lit sprites) to be actually lit with modellight/lightgrid, they are still not lit by realtime lightning at all.

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

13 years agoadd sv_gameplayfix_nostepmoveonsteepslopes which prevents MOVETYPE_STEP monsters...
vortex [Sun, 17 Oct 2010 19:23:27 +0000 (19:23 +0000)]
add sv_gameplayfix_nostepmoveonsteepslopes which prevents MOVETYPE_STEP monsters (no FL_SWIM or FL_FLY ones) from walking very steep slopes

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

13 years agofix two types to hopefulyl compile on MSVC
divverent [Sun, 17 Oct 2010 14:15:06 +0000 (14:15 +0000)]
fix two types to hopefulyl compile on MSVC

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

13 years agoextension (does this need a QC extension name?): allow legacy networked entities...
divverent [Sat, 16 Oct 2010 19:30:17 +0000 (19:30 +0000)]
extension (does this need a QC extension name?): allow legacy networked entities to be attached to CSQC entities added using R_AddEntities with a draw mask. Helps with adopting CSQC networked players in an otherwise legacy networked game.

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

13 years agotry fixing the SSE skeletonobjects case
divverent [Sat, 16 Oct 2010 08:54:06 +0000 (08:54 +0000)]
try fixing the SSE skeletonobjects case

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

13 years agoonly enable SSE if __GNUC__ for the moment... needs fixing later
divverent [Sat, 16 Oct 2010 08:41:21 +0000 (08:41 +0000)]
only enable SSE if __GNUC__ for the moment... needs fixing later

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

13 years agooops, add back 3 lines I accidentally removed
Rudolf Polzer [Fri, 15 Oct 2010 22:51:42 +0000 (00:51 +0200)]
oops, add back 3 lines I accidentally removed

13 years agoPolygonBegin: support a third argument "is2d"; fix a depth range bug
divverent [Fri, 15 Oct 2010 22:40:02 +0000 (22:40 +0000)]
PolygonBegin: support a third argument "is2d"; fix a depth range bug

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

13 years agoR_BeginPolygon: if done in 3D stage, make sure depth test is done
divverent [Fri, 15 Oct 2010 22:39:58 +0000 (22:39 +0000)]
R_BeginPolygon: if done in 3D stage, make sure depth test is done

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

13 years agoonly apply the CFLAGS_CRYPTO to the crypto compile; helps in the Xonotic build system
divverent [Fri, 15 Oct 2010 14:23:12 +0000 (14:23 +0000)]
only apply the CFLAGS_CRYPTO to the crypto compile; helps in the Xonotic build system

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

13 years agoCryptographic authentication support for the d0_blind_id library available on http...
divverent [Fri, 15 Oct 2010 13:47:19 +0000 (13:47 +0000)]
Cryptographic authentication support for the d0_blind_id library available on http://github.com/divVerent/d0_blind_id

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

13 years agomove EXACTSPECULARMATH to the "lightweight" permutation system too, as there is no...
divverent [Thu, 14 Oct 2010 06:15:03 +0000 (06:15 +0000)]
move EXACTSPECULARMATH to the "lightweight" permutation system too, as there is no need to have it able to degrade

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

13 years agoadd back VorteX's "lightweight shader parameter" system, but have it detect cvar...
divverent [Thu, 14 Oct 2010 06:14:59 +0000 (06:14 +0000)]
add back VorteX's "lightweight shader parameter" system, but have it detect cvar changes and recompile all glsl shaders if any changed so these can be changed at runtime still

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

13 years agoremove r_glsl_saturation_redcompensate, as it's considered a hack and can be done...
vortex [Wed, 13 Oct 2010 22:49:54 +0000 (22:49 +0000)]
remove r_glsl_saturation_redcompensate, as it's considered a hack and can be done with postprocess customizing

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

13 years agoAdded dp_waterscroll <scale> <speed> shader keyword as simple simulation of water...
vortex [Wed, 13 Oct 2010 22:00:16 +0000 (22:00 +0000)]
Added dp_waterscroll <scale> <speed> shader keyword as simple simulation of water movement, use with dp_water. Works only with r_water 1.

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

13 years agoadd r_glsl_saturation_redcompensate optional effect to r_glsl_saturate (only works...
vortex [Wed, 13 Oct 2010 20:57:26 +0000 (20:57 +0000)]
add r_glsl_saturation_redcompensate optional effect to r_glsl_saturate (only works when saturate is below 1), will produce desaturation with red channel compensated. Tweaked water shader parms, added slight water animation by counter-scrolling 2 water normalmap layers in shader.

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

13 years agohope the scissor code is fine now
divverent [Wed, 13 Oct 2010 20:45:36 +0000 (20:45 +0000)]
hope the scissor code is fine now

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

13 years agobring old R_Shadow_ScissorForBBox code (new code still there, commented out), since...
vortex [Wed, 13 Oct 2010 20:33:30 +0000 (20:33 +0000)]
bring old R_Shadow_ScissorForBBox code (new code still there, commented out), since new code is broken on ATI cards, a temporary solution

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

13 years agooops, scissormode wasn't meant to be CVAR_SAVE
divverent [Wed, 13 Oct 2010 19:57:13 +0000 (19:57 +0000)]
oops, scissormode wasn't meant to be CVAR_SAVE

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

13 years agoshut up a gcc warning
divverent [Wed, 13 Oct 2010 19:46:10 +0000 (19:46 +0000)]
shut up a gcc warning

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

13 years agofix D3D scissoring
divverent [Wed, 13 Oct 2010 19:32:40 +0000 (19:32 +0000)]
fix D3D scissoring

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

13 years agofix another typo in the water rendering improvement
divverent [Wed, 13 Oct 2010 17:42:50 +0000 (17:42 +0000)]
fix another typo in the water rendering improvement

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

13 years agor_water_scissormode: 0 = none, 1 = scissor only, 2 = cull only, 3 = both
divverent [Wed, 13 Oct 2010 17:22:56 +0000 (17:22 +0000)]
r_water_scissormode: 0 = none, 1 = scissor only, 2 = cull only, 3 = both

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

13 years agoadjust for left handed coordinate system in a reflected view
divverent [Wed, 13 Oct 2010 17:18:55 +0000 (17:18 +0000)]
adjust for left handed coordinate system in a reflected view

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

13 years agor_water_scissormode: 0 = none, 1 = glScissor, 2 = glScissor and frustum culling
divverent [Wed, 13 Oct 2010 16:08:13 +0000 (16:08 +0000)]
r_water_scissormode: 0 = none, 1 = glScissor, 2 = glScissor and frustum culling

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

13 years ago"cl_movement_replay 0" to disable the built-in prediction
divverent [Wed, 13 Oct 2010 09:56:29 +0000 (09:56 +0000)]
"cl_movement_replay 0" to disable the built-in prediction

From: Jānis Rūcis <parasti@gmail.com>

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

13 years agoI have no idea why, but R_Viewport_TransformToScreen apparently should NOT invert...
divverent [Sun, 10 Oct 2010 16:36:44 +0000 (16:36 +0000)]
I have no idea why, but R_Viewport_TransformToScreen apparently should NOT invert y, as doing so breaks dynamic light rendering in size-reduced views (HDR, water)

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

13 years agoSSE patch by kyre, with runtime CPU detection and a cvar r_skeletal_use_sse if SSE...
divverent [Fri, 8 Oct 2010 17:54:16 +0000 (17:54 +0000)]
SSE patch by kyre, with runtime CPU detection and a cvar r_skeletal_use_sse if SSE is detected

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

13 years agofix another warning
divverent [Wed, 6 Oct 2010 11:20:45 +0000 (11:20 +0000)]
fix another warning

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

13 years agofix a syntax error. Why didn't my gcc catch it? clang does...
divverent [Wed, 6 Oct 2010 11:19:27 +0000 (11:19 +0000)]
fix a syntax error. Why didn't my gcc catch it? clang does...

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

13 years agofix misparsing of portless IPv6 addresses
divverent [Wed, 6 Oct 2010 09:48:53 +0000 (09:48 +0000)]
fix misparsing of portless IPv6 addresses

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

13 years agoadding my own IPv6 master server: dpmaster.div0.qc.to - default master server 4 ...
divverent [Wed, 6 Oct 2010 09:48:52 +0000 (09:48 +0000)]
adding my own IPv6 master server: dpmaster.div0.qc.to - default master server 4 (admin: divVerent) (only enabled if SUPPORTIPV6)

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

13 years agoturn off the weird "%interface_name" thing in IPv6 addresses, as it won't compare...
divverent [Sun, 3 Oct 2010 13:59:29 +0000 (13:59 +0000)]
turn off the weird "%interface_name" thing in IPv6 addresses, as it won't compare right

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

13 years agomake IPv6 addresses actually work in server queries
divverent [Sun, 3 Oct 2010 13:59:19 +0000 (13:59 +0000)]
make IPv6 addresses actually work in server queries

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

13 years agomake "status" support IPv6
divverent [Sun, 3 Oct 2010 13:06:58 +0000 (13:06 +0000)]
make "status" support IPv6

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

13 years agofix a stupid and trivial IPv6 bug that causes a v6 supporting engine to HANG
divverent [Sat, 2 Oct 2010 19:20:48 +0000 (19:20 +0000)]
fix a stupid and trivial IPv6 bug that causes a v6 supporting engine to HANG

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

13 years agodon't crash in obj loading if v, vt, or vn are NULL or the indices are
havoc [Thu, 30 Sep 2010 20:35:12 +0000 (20:35 +0000)]
don't crash in obj loading if v, vt, or vn are NULL or the indices are
invalid

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

13 years agodepthonly, prepass: do not compare lightmap texture for batching (less meshes)
divverent [Wed, 29 Sep 2010 07:23:15 +0000 (07:23 +0000)]
depthonly, prepass: do not compare lightmap texture for batching (less meshes)

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

13 years agofix lightmap switching/batching in fakelight
Rudolf Polzer [Wed, 29 Sep 2010 07:18:32 +0000 (09:18 +0200)]
fix lightmap switching/batching in fakelight

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

13 years agoRevert "for some reason, it's faster to always set the lightmaptexture (more than...
divverent [Wed, 29 Sep 2010 07:10:44 +0000 (07:10 +0000)]
Revert "for some reason, it's faster to always set the lightmaptexture (more than double fps) even if fakelight is enabled. LordHavoc, any idea why?"

This reverts commit 1a2ab86f0789c4b473dad83368c86634e4b7eb2c.

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

13 years agofix vertextextureblend in fakelight
Rudolf Polzer [Tue, 28 Sep 2010 19:09:13 +0000 (21:09 +0200)]
fix vertextextureblend in fakelight

13 years agofor some reason, it's faster to always set the lightmaptexture (more than double...
Rudolf Polzer [Tue, 28 Sep 2010 12:36:46 +0000 (14:36 +0200)]
for some reason, it's faster to always set the lightmaptexture (more than double fps) even if fakelight is enabled. LordHavoc, any idea why?

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

13 years agor_fakelight: 1 = use "fake" lighting (falloff-less light source at eye origin) if...
divverent [Tue, 28 Sep 2010 12:04:33 +0000 (12:04 +0000)]
r_fakelight: 1 = use "fake" lighting (falloff-less light source at eye origin) if the loaded worldmodel is unlit, 2 = always use "fake" lighting; controlling cvar r_fakelight_intensity (0.75 is an empiric default value that on average seems to match the lightmap brightness of a selection of nexuiz maps)

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

13 years agoavoid crashes if MAX_SVBSP_POLYGONPOINTS would be exceeded
havoc [Mon, 27 Sep 2010 02:44:16 +0000 (02:44 +0000)]
avoid crashes if MAX_SVBSP_POLYGONPOINTS would be exceeded

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

13 years agocameras: when new eye pos == old eye pos, do not create a network eye
divverent [Sun, 26 Sep 2010 17:48:31 +0000 (17:48 +0000)]
cameras: when new eye pos == old eye pos, do not create a network eye

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

13 years agofix alpha in water rendering
divverent [Sun, 26 Sep 2010 17:37:40 +0000 (17:37 +0000)]
fix alpha in water rendering

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

13 years agofix autoload semantics of drawpics
divverent [Sun, 26 Sep 2010 16:45:18 +0000 (16:45 +0000)]
fix autoload semantics of drawpics

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

13 years agofix a display issue with warpzone decals I caused in my last change
divverent [Sun, 26 Sep 2010 12:14:21 +0000 (12:14 +0000)]
fix a display issue with warpzone decals I caused in my last change

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

13 years agofix warnings in terencehill's code
divverent [Sun, 26 Sep 2010 06:40:31 +0000 (06:40 +0000)]
fix warnings in terencehill's code

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

13 years agoallow .alpha to fade out water/refraction/reflection surfaces (only tested on refract...
divverent [Sat, 25 Sep 2010 19:48:30 +0000 (19:48 +0000)]
allow .alpha to fade out water/refraction/reflection surfaces (only tested on refraction at the moment, sorry)

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

13 years agoFix a typo (v_idlescale is always 0 there)
divverent [Sat, 25 Sep 2010 08:39:40 +0000 (08:39 +0000)]
Fix a typo (v_idlescale is always 0 there)

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10495 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=fcdaa4edcc329da6cebc246e0e2db876603f0e05

13 years agoFix showsound that cannot be shown alone cause of a missing check Simplify a bit...
divverent [Sat, 25 Sep 2010 08:39:37 +0000 (08:39 +0000)]
Fix showsound that cannot be shown alone cause of a missing check Simplify a bit the code to avoid redundant checks

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10494 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ecc62789a22a9b7161a863a1c046b8b170c6cca8

13 years agoloadfont now prints a warning if it gets more than MAX_FONT_SIZES sizes and skips...
divverent [Sat, 25 Sep 2010 08:39:33 +0000 (08:39 +0000)]
loadfont now prints a warning if it gets more than MAX_FONT_SIZES sizes and skips duplicated sizes

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10493 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=df715e90671b3ea25ce8e79ebb9f7afc86b42bd0

13 years agoFix again u8_COM_StringLengthNoColors returning always 0 if end is NULL (strlennocol...
divverent [Sat, 25 Sep 2010 08:39:29 +0000 (08:39 +0000)]
Fix again u8_COM_StringLengthNoColors returning always 0 if end is NULL (strlennocol case), and counting 1 less character if the last character is multibyte and end is not NULL

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10492 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a315e532aafafc62929aeed9662cdcb66a454172

13 years agoNew command 'history' and new shortcuts to search through the commands history
divverent [Sat, 25 Sep 2010 08:35:59 +0000 (08:35 +0000)]
New command 'history' and new shortcuts to search through the commands history

ctrl-, goes to the first command of the history
ctrl-. goes to the last command of the history

type a string (wildcards allowed) and
ctrl-f prints all the matching commands
ctrl-r searches backwards
ctrl-shift-r searches forwards

The last 2 shortcuts also point the history's index to the matching command but without fetching it to let one continue the search. To fetch it, it suffices to just press UP or DOWN.

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10491 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0961be131f8762ddd1d659a7a3a2803b42c6bad4

13 years agoFix a possible crash when an invalid skinframe gets accessed after cl.time steps...
divverent [Fri, 24 Sep 2010 21:37:43 +0000 (21:37 +0000)]
Fix a possible crash when an invalid skinframe gets accessed after cl.time steps backwards (e.g. due to time syncing) right after an entity has been created. Might fix the steel storm crash, but certainly IS a segfault on unstable network connection. Note that a%b can be negative for a<0, b>0 (unlike mathematical 'mod' operation, C '%' is based on rounding towards zero)

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

13 years agocomment out another unused var
divverent [Fri, 24 Sep 2010 11:21:33 +0000 (11:21 +0000)]
comment out another unused var

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 1 May 2010 16:48:33 +0000 (16:48 +0000)]
UNMERGE
overhauled vertex formats, now supports 100% interleaved arrays
rendering mode, reworked vertexbuffer management to be a more robust
system, added fully vertex buffered rendering options
(gl_vbo_dynamicvertex, gl_vbo_dynamicindex) which are off by default
(they seem to hurt fps in tests here)
centralized handling of "generic" mesh rendering (fixed function stuff)

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 2 May 2010 14:19:27 +0000 (14:19 +0000)]
UNMERGE
fix a crash on deformvertexes wave

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 2 May 2010 15:08:22 +0000 (15:08 +0000)]
UNMERGE
fix water/reflection/camera surface rendering

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 2 May 2010 18:17:14 +0000 (18:17 +0000)]
UNMERGE
don't generate vertex colors in q1bsp format for shader path

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 00:13:51 +0000 (00:13 +0000)]
UNMERGE
fix a stencil shadowvolume bug with models that use dynamic batches

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 00:16:01 +0000 (00:16 +0000)]
UNMERGE
use rsurface.modelelement3i variable instead of
model->surfmesh.data_element3i for consistency sake

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 00:17:27 +0000 (00:17 +0000)]
UNMERGE
changed R_Mesh_PrepareVertices_*_Unlock and _Lock functions to always
use the rsurface.preparevertices_ arrays, rather than having an
unnecessary renderpath check

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

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 9 May 2010 10:52:43 +0000 (10:52 +0000)]
UNMERGE
fix funny loading screen breakage with DX vertex formats

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

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 17 Jun 2010 21:53:45 +0000 (21:53 +0000)]
UNMERGE
optimize away NOP wave functions in one more case

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 26 Jun 2010 20:46:57 +0000 (20:46 +0000)]
UNMERGE
make sure dynamicvertex gets set by deformvertexes commands

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 2 Jul 2010 02:24:32 +0000 (02:24 +0000)]
UNMERGE
fix a bunch of warnings if compiling darkplaces as C++ in MSVC2008

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 2 Jul 2010 09:00:08 +0000 (09:00 +0000)]
UNMERGE
created new MSVC2008 project files and solution from scratch
fixed several warnings in MSVC2008

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 3 Jul 2010 10:27:16 +0000 (10:27 +0000)]
UNMERGE
implemented Direct3D9 renderer (off by default), not very optimized but almost completely functional

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 3 Jul 2010 10:33:30 +0000 (10:33 +0000)]
UNMERGE
updated glsl and cg (now also directly compiled as hlsl) shaders - integrated the r_bloom_colorsubtract behavior into the shader rather than relying on fixed function blending in an extra pass, this should be a little faster...

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 5 Jul 2010 08:30:22 +0000 (08:30 +0000)]
UNMERGE
remove the #define list at the start of the embedded default.glsl, it
was unintended (this list is prepended by r_glsl_dumpshader)

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

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 9 Jul 2010 17:21:51 +0000 (17:21 +0000)]
UNMERGE
cleanup mempool use when generating a shadow mesh (one instance that used "loadmodel->mempool" that shouldn't)

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:05 +0000 (10:11 +0000)]
UNMERGE
fix a warning in mingw

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:20 +0000 (10:11 +0000)]
UNMERGE
fix a warning in mingw

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:44 +0000 (10:11 +0000)]
UNMERGE
fix more warnings in mingw

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:12:46 +0000 (10:12 +0000)]
UNMERGE
fix a warning in mingw
changed a model->brush.data_nodes check to data_leafs instead

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:13:01 +0000 (10:13 +0000)]
UNMERGE
fix more mingw warnings

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

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:13:17 +0000 (10:13 +0000)]
UNMERGE
fix a mingw warning

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