]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
divverent [Sat, 8 Oct 2011 17:57:23 +0000 (17:57 +0000)]
sound mixing: PROPERLY detect silent sounds. Old code would cut off sounds at -15dB already.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11393
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
12849b354eaba65efdaad7277863f6b0f036bb38
divverent [Tue, 4 Oct 2011 07:42:50 +0000 (07:42 +0000)]
if the two mtimes are identical, also use the max interval as it's better to have this randomization than to have none
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11391
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bdbc7672b5ef00f204f341c95a601f5e71e9e8e0
divverent [Tue, 4 Oct 2011 07:35:39 +0000 (07:35 +0000)]
by default, skip start of the sound, don't delay (to match Quake)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11390
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0a4988964ea439b249f995a6fdc60fb19d108ff3
divverent [Tue, 4 Oct 2011 07:35:35 +0000 (07:35 +0000)]
provide cvars to change identical sound randomization
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11389
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
15340425159ae92f0152468c3ce694d0573da2bc
divverent [Tue, 4 Oct 2011 07:35:30 +0000 (07:35 +0000)]
sound: when randomizing sound start times, check pitch (base speed) too
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11388
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6d2396afcbd2468777f372c680af9a3b679d44a0
divverent [Tue, 4 Oct 2011 11:24:07 +0000 (11:24 +0000)]
server list: allow more AND and OR masks (except in DP_SMALLMEMORY profile)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11392
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
691ac0330045dfcf51fda91fc7704e5fb56b3173
divverent [Sun, 2 Oct 2011 09:37:48 +0000 (09:37 +0000)]
fix warnings I caused in a previous commit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11385
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a4e4ff088918c1516aac7af4c56e08e8b99f8954
divverent [Sat, 1 Oct 2011 15:04:36 +0000 (15:04 +0000)]
fix broken English
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11384
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
df5eb492ae79c0eb2fe4357db00e8a5129b026f6
eihrul [Sat, 1 Oct 2011 02:01:07 +0000 (02:01 +0000)]
fix crash when compiling shadowmaps for certain Q3BSP files with no faces
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11379
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e86ad109f5b381e160458c049bd9351800ccb32f
eihrul [Fri, 30 Sep 2011 14:05:06 +0000 (14:05 +0000)]
better fix for skeletal no-bones case
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11377
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d67118fd26deb0852127704246098681e0ac5399
eihrul [Fri, 30 Sep 2011 14:00:19 +0000 (14:00 +0000)]
handle no-bones case for skeletal animation
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11376
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
729abe44a989e71b183310919dd31fc1ee3aed63
divverent [Sat, 1 Oct 2011 13:29:16 +0000 (13:29 +0000)]
implement digest_hex()
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11382
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
853f7fe77fd4e7a79e682cf964e4ad863a1a60e7
divverent [Sat, 1 Oct 2011 13:29:14 +0000 (13:29 +0000)]
document DP_QC_DIGEST
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11381
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
40ef58498208a4e8df3bba2dd1d7073beca896a7
divverent [Sat, 1 Oct 2011 13:29:12 +0000 (13:29 +0000)]
move crc16()
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11380
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a747d4e88464cf86f98889e166b3a2f87679487
divverent [Fri, 30 Sep 2011 15:02:30 +0000 (15:02 +0000)]
oops, I hadn't document DP_QC_I18N back then... sorry for that
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11378
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
624cb2929567b86701d29ff51d55cba7b74d86fc
havoc [Mon, 26 Sep 2011 23:19:55 +0000 (23:19 +0000)]
Mac:
changed name from Darkplaces to DarkPlaces for consistency
changed launch script filename from darkplaces-sdl to darkplaces-osx-sdl
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11372
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f95dff21595df7f7a7672dd6abe43e4dc8098118
havoc [Mon, 26 Sep 2011 20:50:29 +0000 (20:50 +0000)]
detect if items2 field was declared in the quakec rather than checking
if GAME_HIPNOTIC or GAME_ROGUE because that prevented existing quake
server mods from abusing the runes on the quake hud
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11371
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b4b94ef8c28c401fc4164688438aac71fdf31c04
divverent [Sat, 1 Oct 2011 14:08:36 +0000 (14:08 +0000)]
CSQC_Event_Sound: pass pitch shift info; actually apply received pitch shift data
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11383
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c88063697a4bbe0021c5b24938579136ba35e277
havoc [Wed, 28 Sep 2011 05:05:35 +0000 (05:05 +0000)]
round the pitchchange setting to the nearest value
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11375
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
56619d1466eae24fdfc16a47dfbdbb1dd15c36ee
havoc [Wed, 28 Sep 2011 04:46:59 +0000 (04:46 +0000)]
fix another bug with sound pitchspeed parameter
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11374
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
008c637a3976f0514406779744051b31f41dc768
havoc [Wed, 28 Sep 2011 04:43:41 +0000 (04:43 +0000)]
write SND_SPEEDUSHORT4000 correctly
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11373
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
87f75abf945db568a72881a8cb32073f940d0b79
havoc [Mon, 26 Sep 2011 16:00:20 +0000 (16:00 +0000)]
fix two warnings (both were bad but unlikely to cause issues)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11370
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
119cbafe56ebbac24781cd5526d200e443327267
divverent [Sat, 24 Sep 2011 15:37:28 +0000 (15:37 +0000)]
export DP_SND_SOUND7_WIP2 (pitch shifting) to checkextension
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11367
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
69c7e4df933cc532b149b38bf1c00be6ab64a6a2
divverent [Mon, 19 Sep 2011 11:52:52 +0000 (11:52 +0000)]
video capture: add the missing 32768.0f factor
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11363
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
167d174d353c234a4f965a0bc1e4478e1a5cff86
havoc [Fri, 16 Sep 2011 08:56:11 +0000 (08:56 +0000)]
added network protocol for sound speed
(ushort speed*4000, not compatible with FTEQW, different flag)
added optional pitchchange parameter to pointsound
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11355
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3579ea0a97797b72298e63b723b65e46ea264b14
havoc [Fri, 16 Sep 2011 08:19:12 +0000 (08:19 +0000)]
fixed multiple crashes and infinite loops in sound mixer
reworked channel delay (negative position) to work properly
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11354
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d753608b3258d9713df8b2720d808da22b1442aa
divverent [Fri, 16 Sep 2011 04:47:01 +0000 (04:47 +0000)]
CSQC: support the sound pitch shift arg (NOT in SVQC yet)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11353
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c9555eb003ce4836557a3b3c50871359cdd971c6
havoc [Thu, 15 Sep 2011 19:12:19 +0000 (19:12 +0000)]
sound mixer now operates on floating point, has on-the-fly resampling
(allows features like pitch shifting, and potentially doppler), and the
ogg and modplug streaming code has been largely rewritten, much cleaner
now, this saves about 4MB of ram when playing quake content at default
settings (by not resampling the wav data to 48khz anymore), snd_speed
changes will now apply to next vid_restart (tested at 48, 96, 192khz)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11352
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ff0e0fd9ea6ce001e9c2c6f9e18ecda6aef15d10
vortex [Sat, 24 Sep 2011 15:35:49 +0000 (15:35 +0000)]
CSQC Getlight - added globals:
vector getlight_dir;
vector getlight_ambient;
vector getlight_diffuse;
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11366
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3f7c1a09ec02a66eb2c8f2e56c3333fcd8b86811
divverent [Mon, 26 Sep 2011 04:56:31 +0000 (04:56 +0000)]
DDS: properly count miplevels for 1x1 textures too when DDS saving
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11369
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1822e28ce6572e787ed2c3b78de1619e231d2eff
vortex [Sun, 25 Sep 2011 02:08:56 +0000 (02:08 +0000)]
DP_PHYSICS_ODE: new SOLID_PHYSICS_CYLINDER. New "massofs" vector field (shifts center-of-mass from model center, replaces default 'center of mins/maxs' approach). New "friction" field. Contact friction = cvar:physics_ode_contact_mu * object1.friction * object2.friction.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11368
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
61f44ced2c1db2784bcdb2fe4151fc6f5342248a
havoc [Fri, 23 Sep 2011 16:43:52 +0000 (16:43 +0000)]
if MATERIALFLAG_CUSTOMBLEND, clear MATERIALFLAG_ADD and
MATERIALFLAG_ALPHA, to prevent bugs where code checks those flags
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11365
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
48ccfb68d06fc2f6565ab6c34a0b17fae5393563
havoc [Sun, 18 Sep 2011 02:45:26 +0000 (02:45 +0000)]
fix watershader on entities
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11361
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5123996e8dbc654bb2401492d43205b6b2112ac5
havoc [Sat, 17 Sep 2011 03:23:29 +0000 (03:23 +0000)]
avoid crashes on watershader surfaces in models that are off-screen (yet
somehow marked visible)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11360
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3da7c5e3f841fb6bbe2fdaf85a1e3db7d312232
havoc [Fri, 16 Sep 2011 11:16:59 +0000 (11:16 +0000)]
tighten the tolerances on water plane merging
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11359
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
312e474b1be3555df31be8f8cdcdc1c6ce55a33c
havoc [Fri, 16 Sep 2011 11:09:13 +0000 (11:09 +0000)]
transform surface vertices to worldspace before calculating waterplane
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11358
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e30cc3765421b9eb971085dc809150ead69490c0
havoc [Fri, 16 Sep 2011 10:54:11 +0000 (10:54 +0000)]
fix issues with watershader on models, also now supports deformvertexes
fix issues with sky shaders on models (untested)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11357
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5cdef9218166be3c43ce77f109049a7fdfe5bbb2
divverent [Wed, 21 Sep 2011 12:19:06 +0000 (12:19 +0000)]
prevent recursive invocation of loading screen
when loading the loading screen takes longer than 2 sec
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11364
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4ceac6f4b1855c06e080e722e6c979ea12bad446
divverent [Sun, 18 Sep 2011 05:46:17 +0000 (05:46 +0000)]
cvar saving robustness
Don't match cvars that are equal to their default but not locked if they are
engine cvars. Fixes config value reverting on "invalid basedir".
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11362
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2d2d1188be78d94770e7f73b5ddf81e168edd90b
havoc [Fri, 16 Sep 2011 10:30:44 +0000 (10:30 +0000)]
added scr_screenshot_timestamp cvar which defaults on, this changes the
screenshot numbering scheme to use a time-based numbering system (while
still scanning for available filenames when you take multiple in one
second)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11356
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0915d731759ea1a90cbb4080ecfd49904196e4f2
havoc [Thu, 15 Sep 2011 18:30:38 +0000 (18:30 +0000)]
register the snd_streaming_length cvar
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11351
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5bb90b41c8388fa635546ac995b1db6522881096
divverent [Wed, 14 Sep 2011 09:19:08 +0000 (09:19 +0000)]
new cvar: snd_streaming_length ("don't stream sound files below this length")
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11349
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d176e15384a9f5a97ecd2aa76fb64bf95a4cc6e8
divverent [Wed, 14 Sep 2011 12:39:39 +0000 (12:39 +0000)]
fix a crash on CentOS 5.6
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11350
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a99ab3f4f90e80aaefec428691ec9cc5d904ec93
eihrul [Tue, 13 Sep 2011 16:52:33 +0000 (16:52 +0000)]
slightly better non-VSDCT shadowmap code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11347
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
52e7c8b0b218a1f791f63ef396291b440094bcf3
eihrul [Tue, 13 Sep 2011 02:30:52 +0000 (02:30 +0000)]
abstracted texture2DOffset usage to work around GLSL 130 deprecation warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11346
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1e2a163daa6a95cd073febf6f674a76d8f2fe1eb
eihrul [Tue, 13 Sep 2011 02:17:47 +0000 (02:17 +0000)]
fix error with unused ClientTime reference
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11345
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9bfbab70606e1b1e3dff7a0b2db8ba06862f008c
vortex [Mon, 12 Sep 2011 16:53:12 +0000 (16:53 +0000)]
Added DP_CSQC_ENTITYMODELLIGHT extension (CSQC-updated modellight using modellight_* fields). RF_NOCULL transformed to RF_WORLDOBJECT which gives maximal transparent sorting distance (and disables culling), making transparent RF_WORLDOBJECT order-dependent. This is still a hacky thing and can change in the future since whole concept of this flag is not good (it's a quick trick to solve bugs with rendering of really large sky objects).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11344
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
886221c0a4822afbb9328f3a5ddeee959a1010aa
havoc [Wed, 14 Sep 2011 00:42:26 +0000 (00:42 +0000)]
changed executable name detection to ignore path
changed GAME_SONOFMAN name detection to use sonofman instead of som as
this was causing game detection bugs
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11348
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1a309ba9ce1d66060c46fe04d25f10e5984c4c1a
eihrul [Mon, 12 Sep 2011 11:59:37 +0000 (11:59 +0000)]
slightly faster non-VSDCT GetShadowMapTC2D variant
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11343
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
989ca4a9f1569dff8d782772d43fa8754073ad53
eihrul [Sun, 11 Sep 2011 19:03:05 +0000 (19:03 +0000)]
fix fix for shadow sampler sampling
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11342
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6ce3cc5b34e75de491de3ae697ecaa3fa862f959
eihrul [Sun, 11 Sep 2011 18:44:47 +0000 (18:44 +0000)]
fix sampling of shadow2D results
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11341
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
db598bd1694ad7703502fa73c509beba710fbd0e
divverent [Sun, 11 Sep 2011 12:55:33 +0000 (12:55 +0000)]
clip velocity when detecting ground
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11340
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
06c238641cc16b65e1c4964019107665b29e4507
divverent [Sun, 11 Sep 2011 12:55:30 +0000 (12:55 +0000)]
more canjump fixes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11339
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9bb4f792dfd5ccb934dc1bb0bebaac262a0138e1
divverent [Sat, 10 Sep 2011 21:00:50 +0000 (21:00 +0000)]
fix another canjump tracking bug; STILL not good
(but now the canjump flags in the move queue LOOK consistent, which makes it odd now)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11338
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9a02d85db186f8023bd268726f579fd215fb9272
divverent [Sat, 10 Sep 2011 20:55:32 +0000 (20:55 +0000)]
fix one bug in cl_movement_track_canjump. Still buggy.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11337
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
865254938bfcc5e64e900dc3fb66f964e2f4e911
divverent [Fri, 9 Sep 2011 11:22:49 +0000 (11:22 +0000)]
add a FIXME comment regarding canjump, will check that later
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11336
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
559d94c4f673b43ab58e1dc673b4c82c61f6f73b
divverent [Thu, 8 Sep 2011 18:01:01 +0000 (18:01 +0000)]
modplug. set total length to 1<<30 now, as anything higher causes Host_Error
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11335
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
37f06df27633c20f2ffa4e927f52a826f5fb92eb
havoc [Thu, 8 Sep 2011 01:47:20 +0000 (01:47 +0000)]
changed D3D shader warning prints to dprints
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11334
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
acc9d81f927d5a3d272538462dd521968834da30
divverent [Wed, 7 Sep 2011 05:36:18 +0000 (05:36 +0000)]
simplify: just turn off rtlights on MATERIALFLAG_FULLBRIGHT, which is forced by customblend
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11333
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
894bf4536f8815d72171394f89bf9a6c7f2fa56e
havoc [Wed, 7 Sep 2011 04:12:30 +0000 (04:12 +0000)]
initialize some variables differently in the HLSL shader to hush
warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11332
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
21a8c9024ebe038fe6431c9aa51f7bd557148f53
havoc [Tue, 6 Sep 2011 22:37:47 +0000 (22:37 +0000)]
fix a C++ error introduced when ddspixels was used as a memcpy target
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11331
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
eb3b4433e49c1ceee928c523cd296514b4544431
divverent [Tue, 6 Sep 2011 19:27:58 +0000 (19:27 +0000)]
blendfunc addalpha
shorthand for GL_SRC_ALPHA GL_ONE
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11330
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5aab5bb61a2c4326c191ca7a2f23b20aae0ea5e1
divverent [Tue, 6 Sep 2011 19:26:01 +0000 (19:26 +0000)]
mod_q3shader_force_addalpha (default 0)
treat GL_ONE GL_ONE (or add) blendfunc as GL_SRC_ALPHA GL_ONE for compatibility with older DarkPlaces releases
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11329
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f21f81fa1c3b997ef5621380a7c98a6ecee7458e
divverent [Tue, 6 Sep 2011 17:26:54 +0000 (17:26 +0000)]
now that DDS loading is consistent with RGBA loading again, let's properly set TEXF_ALPHA _only_ if the blendfunc uses alpha
THIS BREAKS blendfunc add WITH ALPHA CHANNEL, AS THE ALPHA CHANNEL IS NOW PROPERLY IGNORED.
Use blendfunc GL_SRC_ALPHA GL_ONE if you want to add with alpha channel!
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11328
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e5a3f9b08901300af64ee36273deaba8f6c49935
divverent [Tue, 6 Sep 2011 17:26:51 +0000 (17:26 +0000)]
DDS support: convert DXT3/DXT5 to DXT1 when requesting non-alpha (correctness)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11327
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
dc4219418b6d44180d5b467189262d79d0b99d14
divverent [Tue, 6 Sep 2011 17:02:34 +0000 (17:02 +0000)]
fix interaction of blendfunc with rtlights
basically, we exclude a number of CUSTOMBLEND blendfuncs from receiving rtlights
the rationale is not that doing this is always correct - it is not in some
cases (e.g. for crazy stuff like GL_ONE GL_SRC_COLOR). The rationale is that
the current behaviour for these is wrong too.
All surfaces that now receive rtlights, receive it correctly.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11326
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2e6fc7e2da0e578063b0d6111db0d3012dc44908
divverent [Tue, 6 Sep 2011 17:02:29 +0000 (17:02 +0000)]
Revert "disable divVerent's texflags hack for now because it is breaking"
This reverts commit
b8d8e2759007ef43aa26459b0a2f5fd3ae4394b0 .
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11325
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cf41db5c7b7f87d51ed62d8999338a2349eceb8d
havoc [Mon, 5 Sep 2011 23:49:16 +0000 (23:49 +0000)]
disable divVerent's texflags hack for now because it is breaking
steelstorm's light interactions with transparent materials, until this
issue can be investigated properly this code will be disabled
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11324
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b8d8e2759007ef43aa26459b0a2f5fd3ae4394b0
vortex [Sun, 21 Aug 2011 14:55:40 +0000 (14:55 +0000)]
2 new cvars: sv_gameplayfix_unstickentities and sv_gameplayfix_unstickplayers to enable/disable unsticking checks, added a couple of VF_ parms for csqc setview to control fog (so CSQC viewports can have different fog settings). Rearranged fog update (moved all update code from R_UpdateVariables to R_UpdateFog which is called for each viewport render), so can have different fog settings for several viewports. Added back cvar r_transparent_sortmindist.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11289
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d35a3da5c044ae514578d133eced5a9e8ee17bb0