git.rm.cloudns.org Git - xonotic/darkplaces.git/log

]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log

projects / xonotic / darkplaces.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

havoc [Tue, 16 Aug 2011 11:39:27 +0000 (11:39 +0000)]

implemented CSQC_InputEvent type 2 and type 3 mouse move events
added cl_csqc_generatemousemoveevents cvar to allow this to be disabled
based on gamemode (currently disabled in GAME_STEELSTORM due to csqc bugs)

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

commit | commitdiff | tree

divverent [Sat, 3 Sep 2011 20:13:16 +0000 (20:13 +0000)]

showtex 1

shows the texture on crosshair (only world and SOLID_BSP surfaces)

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

commit | commitdiff | tree

divverent [Sat, 3 Sep 2011 15:06:21 +0000 (15:06 +0000)]

disable offsetmapping where TEXF_ALPHA is not set and no height bias exists

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

commit | commitdiff | tree

divverent [Fri, 2 Sep 2011 21:09:25 +0000 (21:09 +0000)]

add -noconsole option to block console input and display

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

commit | commitdiff | tree

divverent [Fri, 2 Sep 2011 20:24:31 +0000 (20:24 +0000)]

also set TEXF_ALPHA on GL_ONE GL_ONE (don't ask)

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

commit | commitdiff | tree

divverent [Fri, 2 Sep 2011 18:25:53 +0000 (18:25 +0000)]

enable offsetmapping permutations only if a normalmap exists and no bias is set

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

commit | commitdiff | tree

divverent [Mon, 29 Aug 2011 20:20:38 +0000 (20:20 +0000)]

set TEXF_ALPHA on shader stages only if necessary

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

commit | commitdiff | tree

divverent [Thu, 1 Sep 2011 18:26:25 +0000 (18:26 +0000)]

change how offsetmapping bias works for less artifacts in offsetmapping mode

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

commit | commitdiff | tree

divverent [Thu, 1 Sep 2011 07:49:18 +0000 (07:49 +0000)]

fix parameter number

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

commit | commitdiff | tree

divverent [Thu, 1 Sep 2011 07:09:19 +0000 (07:09 +0000)]

change to offsetmapping syntax:

dpoffsetmapping - SCALE bias BIASVALUE
dpoffsetmapping - SCALE match FLOAT_PIXEL_VALUE_THAT_IS_BASE_LEVEL
dpoffsetmapping - SCALE match8 8BIT_PIXEL_VALUE_THAT_IS_BASE_LEVEL
dpoffsetmapping - SCALE match16 16BIT_PIXEL_VALUE_THAT_IS_BASE_LEVEL

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

commit | commitdiff | tree

divverent [Wed, 31 Aug 2011 05:42:35 +0000 (05:42 +0000)]

on Unix, avoid actually creating config.cfg when testing gamedirs

We can use access() with W_OK | X_OK on the directory instead there

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

commit | commitdiff | tree

divverent [Tue, 30 Aug 2011 14:55:33 +0000 (14:55 +0000)]

fix a typo causing compile error

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

commit | commitdiff | tree

divverent [Tue, 30 Aug 2011 13:14:55 +0000 (13:14 +0000)]

fix another data loss type conversion

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

commit | commitdiff | tree

divverent [Tue, 30 Aug 2011 12:10:35 +0000 (12:10 +0000)]

offsetbias: changed range to 0..1 to match what the shader does

(agreed to with LordHavoc)

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

commit | commitdiff | tree

divverent [Mon, 29 Aug 2011 20:23:09 +0000 (20:23 +0000)]

make offsetmapping bias actually work

(integer division -> float division)

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

commit | commitdiff | tree

vortex [Mon, 29 Aug 2011 19:35:03 +0000 (19:35 +0000)]

Offsetmapping: new "Bias" parameter that sets a custom "null point" instead of always having fixed one (at white), set as 0-255 byte additional "dpoffsetmapping" parm (dpoffsetmapping <technic> <scale> <bias>) a value of 128 makes offsetmapping centered at gray (no effect at gray, black is positive offset, white is negative). Additinally "dpoffsetmapping disabled" now parsed correctly. To see difference of offsetmapping bias see this shot (animated): http://omnicide.legacy-of-kain.ru/work/omnicide000137.gif

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

commit | commitdiff | tree

eihrul [Wed, 24 Aug 2011 11:47:00 +0000 (11:47 +0000)]

add missing uniform

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

commit | commitdiff | tree

divverent [Wed, 24 Aug 2011 09:02:05 +0000 (09:02 +0000)]

who's inserting CRLFs all the time

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

commit | commitdiff | tree

vortex [Tue, 23 Aug 2011 22:13:07 +0000 (22:13 +0000)]

Experimental r_glsl_offsetmapping_lod cvar which applies a distance-based correction to number of offsetmapping steps, makes up to 40% fps boost on open area maps with lots of reliefmapped surfaces and no quality loss, gives about 5-10% on generic case (requires accurate tweaking for best results).

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

commit | commitdiff | tree

divverent [Sat, 27 Aug 2011 19:00:18 +0000 (19:00 +0000)]

implement TEXF_FORCE_RELOAD to reload a pre-existing skinframe

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

commit | commitdiff | tree

divverent [Sat, 27 Aug 2011 18:52:13 +0000 (18:52 +0000)]

fix cachepic handling with respect to r_restart and Draw_NewPic

Some forgotten memsets, and attempts to free the notexture, could wreak havoc

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

commit | commitdiff | tree

divverent [Mon, 29 Aug 2011 19:23:31 +0000 (19:23 +0000)]

add missing TEXF_ALPHA when loading the glossmap

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

commit | commitdiff | tree

divverent [Mon, 29 Aug 2011 19:08:36 +0000 (19:08 +0000)]

gloss: exact specular math has min gloss exponent 4, not 1

this is because both yield to "internal exponent" 1, because exactspecularmath has to divide the exponent by 4 to look the same

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

commit | commitdiff | tree

divverent [Mon, 29 Aug 2011 15:23:33 +0000 (15:23 +0000)]

make sure another way it never calculates 0^0

we now avoid too-small exponents instead (alpha 0 now is exponent 1, not 0)

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

RSS Atom