]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
13 years agofix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD
Rudolf Polzer [Wed, 2 Nov 2011 11:08:52 +0000 (12:08 +0100)]
fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD

13 years agomark 5 permutation bits eligible for moving to static parms
divverent [Wed, 2 Nov 2011 09:01:54 +0000 (09:01 +0000)]
mark 5 permutation bits eligible for moving to static parms

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

13 years agowin32: add two includes to make sure the constants for file mode and sharing are...
divverent [Wed, 2 Nov 2011 08:07:23 +0000 (08:07 +0000)]
win32: add two includes to make sure the constants for file mode and sharing are there

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

13 years agofix some typos
divverent [Wed, 2 Nov 2011 05:42:40 +0000 (05:42 +0000)]
fix some typos

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

13 years agoCommand line: -sessionid, cvars: locksession, (R/O) sessionid
divverent [Tue, 1 Nov 2011 14:45:57 +0000 (14:45 +0000)]
Command line: -sessionid, cvars: locksession, (R/O) sessionid

Allows games to require a session lock. Put "locksession 1" in the game's default config file and users then need to run instances with unique -sessionid parameter.

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

13 years agofix an issue with glStencilFuncSeparate being misused (strange that I don't think...
havoc [Tue, 1 Nov 2011 13:25:56 +0000 (13:25 +0000)]
fix an issue with glStencilFuncSeparate being misused (strange that I don't think I ever got a GL error on this before)
fixed deferred rendering in D3D9 renderer

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

13 years agoimpact handling: instead of detecting teleports by origin or angles changing, detect...
divverent [Tue, 1 Nov 2011 12:22:59 +0000 (12:22 +0000)]
impact handling: instead of detecting teleports by origin or angles changing, detect teleports by calls to the setorigin() builtin

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

13 years agospeed up leaktest a bit
divverent [Tue, 1 Nov 2011 12:22:57 +0000 (12:22 +0000)]
speed up leaktest a bit

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

13 years agoVM_Warning should appear even if developer is 0.
divverent [Tue, 1 Nov 2011 09:38:50 +0000 (09:38 +0000)]
VM_Warning should appear even if developer is 0.

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

13 years agoremove debug print
divverent [Tue, 1 Nov 2011 11:30:21 +0000 (11:30 +0000)]
remove debug print

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

13 years agomore parsing fix
divverent [Tue, 1 Nov 2011 11:30:19 +0000 (11:30 +0000)]
more parsing fix

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

13 years agofix a parsing issue for framegroups files
divverent [Tue, 1 Nov 2011 11:20:32 +0000 (11:20 +0000)]
fix a parsing issue for framegroups files

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

13 years agoturn "z value discarded" into VM_Warnings so one can backtrace them
divverent [Tue, 1 Nov 2011 09:25:09 +0000 (09:25 +0000)]
turn "z value discarded" into VM_Warnings so one can backtrace them

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

13 years agochanged sv_fixedframeratesingleplayer logic a bit (now 10ms to 100ms per
havoc [Mon, 31 Oct 2011 08:35:12 +0000 (08:35 +0000)]
changed sv_fixedframeratesingleplayer logic a bit (now 10ms to 100ms per
frame as in original Quake), this cvar is off by default so it should
not be a concern

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

13 years agoUNMERGE! removed r_shadow_deferred_8bitrange cvar
havoc [Mon, 31 Oct 2011 07:14:35 +0000 (07:14 +0000)]
UNMERGE! removed r_shadow_deferred_8bitrange cvar

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

13 years agofix C++ compile error
havoc [Sun, 30 Oct 2011 02:55:30 +0000 (02:55 +0000)]
fix C++ compile error

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

13 years agoadded USEDGA define, disabled by default, to suppress the xf86dga.h
havoc [Sun, 23 Oct 2011 22:52:12 +0000 (22:52 +0000)]
added USEDGA define, disabled by default, to suppress the xf86dga.h
deprecated warnings by not using the dga code anymore

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

13 years agohit q1bsp sky as a solid in surface traceline
havoc [Mon, 31 Oct 2011 07:57:35 +0000 (07:57 +0000)]
hit q1bsp sky as a solid in surface traceline

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

13 years agoundo the SUPERCONTENTS_SKY change, it should not be treated as solid,
havoc [Mon, 31 Oct 2011 07:56:24 +0000 (07:56 +0000)]
undo the SUPERCONTENTS_SKY change, it should not be treated as solid,
instead the q1bsp loader should set SUPERCONTENTS_SOLID

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

13 years agolet traces hit sky by default, don't know why this wasn't in
havoc [Sat, 29 Oct 2011 07:27:10 +0000 (07:27 +0000)]
let traces hit sky by default, don't know why this wasn't in

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

13 years agoframegroups: add support for group names specified as // comment
divverent [Thu, 27 Oct 2011 07:08:50 +0000 (07:08 +0000)]
framegroups: add support for group names specified as // comment

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

13 years agoremoved r_shadow_deferred_8bitrange cvar
havoc [Mon, 31 Oct 2011 07:14:35 +0000 (07:14 +0000)]
removed r_shadow_deferred_8bitrange cvar

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

13 years agofix r_shadow_deferred total breakage from r11146
havoc [Mon, 31 Oct 2011 07:01:42 +0000 (07:01 +0000)]
fix r_shadow_deferred total breakage from r11146

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

13 years agofix dpmod shell casings spinning on the floor by disabling the
havoc [Mon, 31 Oct 2011 06:52:07 +0000 (06:52 +0000)]
fix dpmod shell casings spinning on the floor by disabling the
velocity-change-is-a-teleport logic in SV_PushEntity

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

13 years agocleaned up SV_Physics_Toss code to be more maintainable
havoc [Mon, 31 Oct 2011 06:14:49 +0000 (06:14 +0000)]
cleaned up SV_Physics_Toss code to be more maintainable

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

13 years agoadded support for GL_EXT_packed_depth_stencil, this means that r_viewfbo
havoc [Mon, 31 Oct 2011 00:42:04 +0000 (00:42 +0000)]
added support for GL_EXT_packed_depth_stencil, this means that r_viewfbo
no longer breaks stencil shadows

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

13 years agovid_soft_threads 8 by default because excessive threads doesn't hurt
havoc [Wed, 26 Oct 2011 22:57:31 +0000 (22:57 +0000)]
vid_soft_threads 8 by default because excessive threads doesn't hurt
low-core cpus very much and this helps high-core cpus a lot

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

13 years agoallow .psk models to be loaded without a corresponding .psa file
havoc [Sat, 29 Oct 2011 07:10:46 +0000 (07:10 +0000)]
allow .psk models to be loaded without a corresponding .psa file

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

13 years agoless warning spew about non-existent frames in a model (developer_extra
havoc [Sat, 29 Oct 2011 07:09:52 +0000 (07:09 +0000)]
less warning spew about non-existent frames in a model (developer_extra
is now checked) and also not warning about using a frame number on a
model with only one frame

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

13 years agoadded USEREFLECTCUBE case to MODE_GENERIC, this disables use of texture
havoc [Thu, 27 Oct 2011 21:07:34 +0000 (21:07 +0000)]
added USEREFLECTCUBE case to MODE_GENERIC, this disables use of texture
alpha on the first texture so that the motion blur compositing works
properly regardless of accumulated framebuffer alpha
fix USEGAMMARAMPS in HLSL because it was using an undeclared
dp_texture2D macro

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

13 years ago-demo and -capturedemo: don't quit if loading another demo, only quit when no more...
divverent [Thu, 27 Oct 2011 19:59:02 +0000 (19:59 +0000)]
-demo and -capturedemo: don't quit if loading another demo, only quit when no more demos are started

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

13 years agoLinux dedicated server: set nice -19 while spawning server (can be turned off by...
divverent [Wed, 26 Oct 2011 09:07:21 +0000 (09:07 +0000)]
Linux dedicated server: set nice -19 while spawning server (can be turned off by -nonice option)

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

13 years agoHMAC: remove static vars
divverent [Tue, 25 Oct 2011 11:14:32 +0000 (11:14 +0000)]
HMAC: remove static vars

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

13 years agofix Collision_ClipTrace_Line_Sphere calculation of impactdist (had a
havoc [Mon, 24 Oct 2011 09:42:37 +0000 (09:42 +0000)]
fix Collision_ClipTrace_Line_Sphere calculation of impactdist (had a
discussion about this previously but forgot the solution, now reminded)

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

13 years agofix a sRGB conversion in effectinfo handling
divverent [Sun, 23 Oct 2011 15:53:12 +0000 (15:53 +0000)]
fix a sRGB conversion in effectinfo handling

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

13 years agouse checkdisk flag on model loading after ingame download, this should
havoc [Sat, 22 Oct 2011 22:28:04 +0000 (22:28 +0000)]
use checkdisk flag on model loading after ingame download, this should
eliminate the need for r_restart

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

13 years agodon't crash when .clientcamera is set on a botclient
havoc [Sat, 22 Oct 2011 00:01:07 +0000 (00:01 +0000)]
don't crash when .clientcamera is set on a botclient

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

13 years agofix factors in sRGBlightmaps code
divverent [Sat, 22 Oct 2011 16:00:16 +0000 (16:00 +0000)]
fix factors in sRGBlightmaps code

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

13 years agofix image loading sRGB conversion
divverent [Sat, 22 Oct 2011 15:28:56 +0000 (15:28 +0000)]
fix image loading sRGB conversion

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

13 years agomore sRGB simplification
divverent [Sat, 22 Oct 2011 15:08:47 +0000 (15:08 +0000)]
more sRGB simplification

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

13 years agoa harmless sRGB simplification, more to be done later
divverent [Sat, 22 Oct 2011 14:19:37 +0000 (14:19 +0000)]
a harmless sRGB simplification, more to be done later

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

13 years agouse the correct sRGB conversion for the gamma ramps
divverent [Fri, 21 Oct 2011 11:09:48 +0000 (11:09 +0000)]
use the correct sRGB conversion for the gamma ramps

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

13 years agofix another typo in sRGB conversion
divverent [Fri, 21 Oct 2011 10:23:12 +0000 (10:23 +0000)]
fix another typo in sRGB conversion

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

13 years agomake sRGB conversions match entirely with GL_EXT_texture_sRGB spec
divverent [Fri, 21 Oct 2011 10:12:43 +0000 (10:12 +0000)]
make sRGB conversions match entirely with GL_EXT_texture_sRGB spec

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

13 years agofix a compile error in recent bloom changes
divverent [Wed, 19 Oct 2011 07:33:08 +0000 (07:33 +0000)]
fix a compile error in recent bloom changes

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

13 years agooption: mod_q3bsp_sRGBlightmaps (experimental)
divverent [Fri, 21 Oct 2011 09:59:59 +0000 (09:59 +0000)]
option: mod_q3bsp_sRGBlightmaps (experimental)

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

13 years agovid_sRGB_fallback: now 3 is unconditional, and 2 also falls back if framebuffer is...
divverent [Fri, 21 Oct 2011 04:41:30 +0000 (04:41 +0000)]
vid_sRGB_fallback: now 3 is unconditional, and 2 also falls back if framebuffer is 8bit (I know this detection breaks when toggling r_viewfbo at runtime, don't care, people shall do vid_restart)

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

13 years agomake the sRGB fallback cvar controlled (and off by default)
divverent [Thu, 20 Oct 2011 17:40:37 +0000 (17:40 +0000)]
make the sRGB fallback cvar controlled (and off by default)

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

13 years agofix parts of the sRGB emulation
divverent [Thu, 20 Oct 2011 17:40:36 +0000 (17:40 +0000)]
fix parts of the sRGB emulation

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

13 years agosRGB: also handle sRGB for loading DDS textures
divverent [Thu, 20 Oct 2011 17:40:34 +0000 (17:40 +0000)]
sRGB: also handle sRGB for loading DDS textures

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

13 years agosRGB: also convert vertex colors
divverent [Thu, 20 Oct 2011 17:40:31 +0000 (17:40 +0000)]
sRGB: also convert vertex colors

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

13 years agorename the function
divverent [Thu, 20 Oct 2011 17:40:30 +0000 (17:40 +0000)]
rename the function

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

13 years agoconvert lightmaps to sRGB for nice sRGB support
divverent [Thu, 20 Oct 2011 17:40:28 +0000 (17:40 +0000)]
convert lightmaps to sRGB for nice sRGB support

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

13 years agomake R_SetupView take view size from fbo textures if available
eihrul [Tue, 18 Oct 2011 07:56:03 +0000 (07:56 +0000)]
make R_SetupView take view size from fbo textures if available

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

13 years agofix fbo var name bug in R_DrawModelShadowMaps
eihrul [Tue, 18 Oct 2011 07:14:43 +0000 (07:14 +0000)]
fix fbo var name bug in R_DrawModelShadowMaps

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

13 years agofix one C++ compile error. It looks like we have no more wrong declaration of functio...
divverent [Tue, 18 Oct 2011 07:00:38 +0000 (07:00 +0000)]
fix one C++ compile error. It looks like we have no more wrong declaration of function issues, as C++ name mangling should have detected them.

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

13 years agomove these declarations to where they belong
divverent [Tue, 18 Oct 2011 06:58:29 +0000 (06:58 +0000)]
move these declarations to where they belong

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

13 years agofix R_DrawModelShadows/R_DrawModelShadowMaps prototypes not matching definitions
eihrul [Tue, 18 Oct 2011 06:52:23 +0000 (06:52 +0000)]
fix R_DrawModelShadows/R_DrawModelShadowMaps prototypes not matching definitions

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

13 years agoreworked collision cache to only be used by bouncegrid and only in
havoc [Mon, 17 Oct 2011 17:00:10 +0000 (17:00 +0000)]
reworked collision cache to only be used by bouncegrid and only in
dynamic mode (static mode no longer causes several heart attacks in the
collision cache as it executes many times the regular amount of traces)

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

13 years agoinit/shutdown thread system in dedicated server as well
havoc [Mon, 17 Oct 2011 11:16:53 +0000 (11:16 +0000)]
init/shutdown thread system in dedicated server as well

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

13 years agoproperly detect vid.samples value if overridden by driver
divverent [Sun, 16 Oct 2011 14:17:50 +0000 (14:17 +0000)]
properly detect vid.samples value if overridden by driver

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

13 years agoif vid_samples is > 1 then do not use fbo view or water renders
havoc [Sun, 16 Oct 2011 13:50:53 +0000 (13:50 +0000)]
if vid_samples is > 1 then do not use fbo view or water renders

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

13 years agofix motionblur with r_viewfbo 2 or 3
havoc [Sun, 16 Oct 2011 12:49:59 +0000 (12:49 +0000)]
fix motionblur with r_viewfbo 2 or 3

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

13 years agofor now, turn off FBO if multisampling as their combination is not implemented yet
divverent [Sun, 16 Oct 2011 12:39:10 +0000 (12:39 +0000)]
for now, turn off FBO if multisampling as their combination is not implemented yet

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

13 years agoadded r_water_fbo cvar to enable fbo rendering of water by default
havoc [Sun, 16 Oct 2011 09:57:08 +0000 (09:57 +0000)]
added r_water_fbo cvar to enable fbo rendering of water by default
regardless of r_viewfbo

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

13 years agoremoved cvars r_hdr and r_hdr_range - now the only way to get HDR
havoc [Sun, 16 Oct 2011 09:54:40 +0000 (09:54 +0000)]
removed cvars r_hdr and r_hdr_range - now the only way to get HDR
rendering is using r_viewfbo 2 (which is faster and nicer)
implemented fbo rendering for water, bloom and gamma, setting r_viewfbo
to 1 gives a consistent speed gain because it avoids all texture copies

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

13 years agooverhauling a lot of functions to allow fbo rendering
havoc [Sun, 16 Oct 2011 09:38:54 +0000 (09:38 +0000)]
overhauling a lot of functions to allow fbo rendering

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

13 years agorenamed r_bloomstate to r_fb because it contains framebuffer settings
havoc [Sun, 16 Oct 2011 09:11:52 +0000 (09:11 +0000)]
renamed r_bloomstate to r_fb because it contains framebuffer settings
moved r_waterstate to r_fb.water

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

13 years agofix more crashes to do with animscenes being NULL on some models,
havoc [Mon, 17 Oct 2011 17:19:28 +0000 (17:19 +0000)]
fix more crashes to do with animscenes being NULL on some models,
audited all the isanimated lines

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

13 years agoadded sv_disablenotify cvar (default 1) to suppress prints about
havoc [Mon, 17 Oct 2011 17:07:41 +0000 (17:07 +0000)]
added sv_disablenotify cvar (default 1) to suppress prints about
CVAR_NOTIFY cvars changing

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

13 years agoallow terminal input on sdl client as well (glx client already does)
havoc [Mon, 17 Oct 2011 12:02:53 +0000 (12:02 +0000)]
allow terminal input on sdl client as well (glx client already does)

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

13 years agonew cvar: cl_maxphysicsframesperserverframe
divverent [Mon, 17 Oct 2011 11:07:20 +0000 (11:07 +0000)]
new cvar: cl_maxphysicsframesperserverframe

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

13 years agofix byte color handling in iqm loader
havoc [Sun, 16 Oct 2011 18:26:06 +0000 (18:26 +0000)]
fix byte color handling in iqm loader

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

13 years agooops, missed this
havoc [Sun, 16 Oct 2011 08:55:06 +0000 (08:55 +0000)]
oops, missed this

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

13 years agoadded cvar r_water_hideplayer with 3 possible values (can hide from
havoc [Sun, 16 Oct 2011 08:50:13 +0000 (08:50 +0000)]
added cvar r_water_hideplayer with 3 possible values (can hide from
nothing, refraction, or refraction and reflection)
renamed r_waterstate.renderingrefraction to r_waterstate.hideplayer

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

13 years agofix two crashes that divVerent found and fixed but didn't commit
havoc [Sat, 15 Oct 2011 00:19:54 +0000 (00:19 +0000)]
fix two crashes that divVerent found and fixed but didn't commit

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

13 years agofix crashes with last patch to model loaders
havoc [Fri, 14 Oct 2011 08:28:45 +0000 (08:28 +0000)]
fix crashes with last patch to model loaders
load vertex colors in iqm model format if they exist (can be accessed in
GLSL Shaders)

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

13 years agoallow iqm models without geometry
havoc [Fri, 14 Oct 2011 06:18:08 +0000 (06:18 +0000)]
allow iqm models without geometry
allow iqm models without animation
compute model->surfmesh.isanimated and model->AnimateVertices in a
better way to make sure static models are identified as such (if bones
is 0 or 1, and no animation frames, treat as static)

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

13 years agocurl: change how failure/success is decided to prevent "black screen" problems if...
divverent [Sat, 15 Oct 2011 21:07:33 +0000 (21:07 +0000)]
curl: change how failure/success is decided to prevent "black screen" problems if an unrelated download 404s

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

13 years agofix crashes in viewthing code
havoc [Sat, 15 Oct 2011 01:53:30 +0000 (01:53 +0000)]
fix crashes in viewthing code

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

13 years agofix warning
divverent [Fri, 14 Oct 2011 18:59:57 +0000 (18:59 +0000)]
fix warning

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

13 years agoadd missing fabs
divverent [Fri, 14 Oct 2011 18:59:55 +0000 (18:59 +0000)]
add missing fabs

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

13 years agofix decay calculation in snd_softclip
divverent [Fri, 14 Oct 2011 18:53:03 +0000 (18:53 +0000)]
fix decay calculation in snd_softclip

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

13 years agosnd_maxchannelvolume and snd_softclip
divverent [Fri, 14 Oct 2011 18:48:59 +0000 (18:48 +0000)]
snd_maxchannelvolume and snd_softclip

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

13 years agoalso support ReplayGain if peak is not defined
divverent [Fri, 14 Oct 2011 17:41:41 +0000 (17:41 +0000)]
also support ReplayGain if peak is not defined

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

13 years agoremoved OffscreenGecko support because it is not maintained
havoc [Fri, 14 Oct 2011 14:47:22 +0000 (14:47 +0000)]
removed OffscreenGecko support because it is not maintained

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

13 years agoremoved scr_zoomwindow feature to simplify code
havoc [Fri, 14 Oct 2011 14:39:55 +0000 (14:39 +0000)]
removed scr_zoomwindow feature to simplify code

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

13 years agofix bugs with CSQC clearscene function - it now restores the view to
havoc [Fri, 14 Oct 2011 14:34:03 +0000 (14:34 +0000)]
fix bugs with CSQC clearscene function - it now restores the view to
what was given to CSQC_UpdateView in the first place
fix bugs with getpropertyvec(VF_FOV) - it reads view.ortho_x and y
values assuming they are the original angles, so these needed to be set
correctly by the engine before invoking CSQC_UpdateView

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

13 years agoadded getproperty and getpropertyvec
havoc [Fri, 14 Oct 2011 13:11:14 +0000 (13:11 +0000)]
added getproperty and getpropertyvec

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

13 years agouse PRVM_serverfunction when looking up SV_ChangeTeam,
havoc [Fri, 14 Oct 2011 09:52:32 +0000 (09:52 +0000)]
use PRVM_serverfunction when looking up SV_ChangeTeam,
not PRVM_clientfunction (harmless but stupid)

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

13 years agomoved surface culling code to a separate function, added a call to it in
havoc [Wed, 12 Oct 2011 12:10:26 +0000 (12:10 +0000)]
moved surface culling code to a separate function, added a call to it in
the custompvs case (for water rendering), should be a good speedup

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

13 years agoadded sv_areadebug cvar which disables the use of the areagrid (VERY bad
havoc [Wed, 12 Oct 2011 10:16:57 +0000 (10:16 +0000)]
added sv_areadebug cvar which disables the use of the areagrid (VERY bad
for performance, use ONLY for testing collision bugs)
added a small padding value (1 unit) to areagrid queries

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

13 years agoadded r_hdr_irisadaptation_radius which determines the area being
havoc [Wed, 12 Oct 2011 10:14:02 +0000 (10:14 +0000)]
added r_hdr_irisadaptation_radius which determines the area being
sampled for lighting to choose a scene brightness...  still a lousy
effect though

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

13 years agodisplay scene brightness (r_refdef.view.colorscale) in r_speeds
havoc [Wed, 12 Oct 2011 10:13:17 +0000 (10:13 +0000)]
display scene brightness (r_refdef.view.colorscale) in r_speeds

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

13 years agoremoved S_StartSound_StartPosition function because it was unnecessary
havoc [Wed, 12 Oct 2011 08:18:30 +0000 (08:18 +0000)]
removed S_StartSound_StartPosition function because it was unnecessary
make sure flags is passed correctly to CL_VM_Event_Sound and
S_StartSound_StartPosition_Flags

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

13 years agoadded cvar sv_gameplayfix_bugfixedcheckwatertransition to allow the
havoc [Wed, 12 Oct 2011 08:15:00 +0000 (08:15 +0000)]
added cvar sv_gameplayfix_bugfixedcheckwatertransition to allow the
contents bugfixes to be disabled if desired, improved contents handling
to prevent a splash sound on spawn

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

13 years agocl_movement: hit CSQC entities if solid (rationale: if you don't want this in your...
divverent [Mon, 10 Oct 2011 10:24:53 +0000 (10:24 +0000)]
cl_movement: hit CSQC entities if solid (rationale: if you don't want this in your mod, don't make the ents solid, virtually nothing else cares for that!); the TracePoint calls used for checking if you are in water are NOT changed by this, as they also do not hit networkplayers and CSQC may have solid network players

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

13 years agoadd cvars: snd_attenuation_exponent, snd_attenuation_decibel
divverent [Sun, 9 Oct 2011 13:37:43 +0000 (13:37 +0000)]
add cvars: snd_attenuation_exponent, snd_attenuation_decibel

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

13 years agoimprove logic for silent sound cutoff based on output buffer width
divverent [Sun, 9 Oct 2011 12:29:49 +0000 (12:29 +0000)]
improve logic for silent sound cutoff based on output buffer width

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

13 years agoadd a TODO comment about sound falloff curve, needs research
divverent [Sat, 8 Oct 2011 18:12:33 +0000 (18:12 +0000)]
add a TODO comment about sound falloff curve, needs research

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