]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
13 years agofix warnings I caused in a previous commit
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

13 years agofix broken English
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

13 years agoCSQC_Event_Sound: pass pitch shift info; actually apply received pitch shift data
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

13 years agoimplement digest_hex()
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

13 years agodocument DP_QC_DIGEST
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

13 years agomove crc16()
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

13 years agofix crash when compiling shadowmaps for certain Q3BSP files with no faces
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

13 years agooops, I hadn't document DP_QC_I18N back then... sorry for that
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

13 years agobetter fix for skeletal no-bones case
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

13 years agohandle no-bones case for skeletal animation
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

13 years agoround the pitchchange setting to the nearest value
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

13 years agofix another bug with sound pitchspeed parameter
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

13 years agowrite SND_SPEEDUSHORT4000 correctly
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

13 years agoMac:
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

13 years agodetect if items2 field was declared in the quakec rather than checking
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

13 years agofix two warnings (both were bad but unlikely to cause issues)
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

13 years agoDDS: properly count miplevels for 1x1 textures too when DDS saving
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

13 years agoDP_PHYSICS_ODE: new SOLID_PHYSICS_CYLINDER. New "massofs" vector field (shifts center...
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

13 years agoexport DP_SND_SOUND7_WIP2 (pitch shifting) to checkextension
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

13 years agoCSQC Getlight - added globals:
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

13 years agoif MATERIALFLAG_CUSTOMBLEND, clear MATERIALFLAG_ADD and
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

13 years agoprevent recursive invocation of loading screen
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

13 years agovideo capture: add the missing 32768.0f factor
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

13 years agocvar saving robustness
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

13 years agofix watershader on entities
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

13 years agoavoid crashes on watershader surfaces in models that are off-screen (yet
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

13 years agotighten the tolerances on water plane merging
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

13 years agotransform surface vertices to worldspace before calculating waterplane
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

13 years agofix issues with watershader on models, also now supports deformvertexes
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

13 years agoadded scr_screenshot_timestamp cvar which defaults on, this changes the
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

13 years agoadded network protocol for sound speed
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

13 years agofixed multiple crashes and infinite loops in sound mixer
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

13 years agoCSQC: support the sound pitch shift arg (NOT in SVQC yet)
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

13 years agosound mixer now operates on floating point, has on-the-fly resampling
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

13 years agoregister the snd_streaming_length cvar
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

13 years agofix a crash on CentOS 5.6
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

13 years agonew cvar: snd_streaming_length ("don't stream sound files below this length")
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

13 years agochanged executable name detection to ignore path
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

13 years agoslightly better non-VSDCT shadowmap code
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

13 years agoabstracted texture2DOffset usage to work around GLSL 130 deprecation warnings
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

13 years agofix error with unused ClientTime reference
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

13 years agoAdded DP_CSQC_ENTITYMODELLIGHT extension (CSQC-updated modellight using modellight_...
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

13 years agoslightly faster non-VSDCT GetShadowMapTC2D variant
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

13 years agofix fix for shadow sampler sampling
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

13 years agofix sampling of shadow2D results
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

13 years agoclip velocity when detecting ground
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

13 years agomore canjump fixes
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

13 years agofix another canjump tracking bug; STILL not good
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

13 years agofix one bug in cl_movement_track_canjump. Still buggy.
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

13 years agoadd a FIXME comment regarding canjump, will check that later
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

13 years agomodplug. set total length to 1<<30 now, as anything higher causes Host_Error
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

13 years agochanged D3D shader warning prints to dprints
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

13 years agosimplify: just turn off rtlights on MATERIALFLAG_FULLBRIGHT, which is forced by custo...
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

13 years agoinitialize some variables differently in the HLSL shader to hush
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

13 years agofix a C++ error introduced when ddspixels was used as a memcpy target
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

13 years agoblendfunc addalpha
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

13 years agomod_q3shader_force_addalpha (default 0)
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

13 years agonow that DDS loading is consistent with RGBA loading again, let's properly set TEXF_A...
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

13 years agoDDS support: convert DXT3/DXT5 to DXT1 when requesting non-alpha (correctness)
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

13 years agofix interaction of blendfunc with rtlights
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

13 years agoRevert "disable divVerent's texflags hack for now because it is breaking"
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

13 years agodisable divVerent's texflags hack for now because it is breaking
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

13 years agoshowtex 1
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

13 years agodisable offsetmapping where TEXF_ALPHA is not set and no height bias exists
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

13 years agoadd -noconsole option to block console input and display
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

13 years agoalso set TEXF_ALPHA on GL_ONE GL_ONE (don't ask)
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

13 years agoenable offsetmapping permutations only if a normalmap exists and no bias is set
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

13 years agochange how offsetmapping bias works for less artifacts in offsetmapping mode
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

13 years agofix parameter number
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

13 years agochange to offsetmapping syntax:
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

13 years agoon Unix, avoid actually creating config.cfg when testing gamedirs
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

13 years agofix a typo causing compile error
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

13 years agofix another data loss type conversion
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

13 years agooffsetbias: changed range to 0..1 to match what the shader does
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

13 years agomake offsetmapping bias actually work
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

13 years agoset TEXF_ALPHA on shader stages only if necessary
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

13 years agoOffsetmapping: new "Bias" parameter that sets a custom "null point" instead of always...
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

13 years agoadd missing TEXF_ALPHA when loading the glossmap
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

13 years agogloss: exact specular math has min gloss exponent 4, not 1
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

13 years agomake sure another way it never calculates 0^0
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

13 years agomake sure gloss never calculates 0^0
divverent [Mon, 29 Aug 2011 14:02:58 +0000 (14:02 +0000)]
make sure gloss never calculates 0^0

as that is undefined and leads to black stuff

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11305 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoimplement TEXF_FORCE_RELOAD to reload a pre-existing skinframe
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

13 years agofix cachepic handling with respect to r_restart and Draw_NewPic
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

13 years agofix bugs introduced by r11262
eihrul [Wed, 24 Aug 2011 12:52:15 +0000 (12:52 +0000)]
fix bugs introduced by r11262

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11302 d7cf8633-e32d-0410-b094-e92efae38249

13 years agothis file needs eol-style too...
divverent [Wed, 24 Aug 2011 12:32:01 +0000 (12:32 +0000)]
this file needs eol-style too...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11301 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd a script to automate svn:eol-style processing
divverent [Wed, 24 Aug 2011 12:31:22 +0000 (12:31 +0000)]
add a script to automate svn:eol-style processing

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11300 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoset svn:eol-style properties on new files
divverent [Wed, 24 Aug 2011 12:31:09 +0000 (12:31 +0000)]
set svn:eol-style properties on new files

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11299 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd missing uniform
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

13 years agofix crashing due to alignment
eihrul [Wed, 24 Aug 2011 10:55:28 +0000 (10:55 +0000)]
fix crashing due to alignment

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11297 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoALIGNED_SIZE -> ALIGN_SIZE
eihrul [Wed, 24 Aug 2011 10:51:39 +0000 (10:51 +0000)]
ALIGNED_SIZE -> ALIGN_SIZE

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11296 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoonly need 4 byte alignment for atomicity
eihrul [Wed, 24 Aug 2011 10:49:14 +0000 (10:49 +0000)]
only need 4 byte alignment for atomicity

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11295 d7cf8633-e32d-0410-b094-e92efae38249

13 years agowho's inserting CRLFs all the time
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

13 years agobig oops: fix C++ compilation (had used "operator" as variable name)
divverent [Wed, 24 Aug 2011 08:49:36 +0000 (08:49 +0000)]
big oops: fix C++ compilation (had used "operator" as variable name)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11293 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoExperimental r_glsl_offsetmapping_lod cvar which applies a distance-based correction...
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

13 years agofix gameversion logic :(
divverent [Tue, 23 Aug 2011 19:25:09 +0000 (19:25 +0000)]
fix gameversion logic :(

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11291 d7cf8633-e32d-0410-b094-e92efae38249

13 years agonew cvar: r_sortentities to sort render edicts.
divverent [Tue, 23 Aug 2011 13:59:15 +0000 (13:59 +0000)]
new cvar: r_sortentities to sort render edicts.

This is not as good as real surface batching across entities, but often about
equally good. Tends to gain about 1% on space maps or other "unvisable stuff".

Not active by default yet.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11290 d7cf8633-e32d-0410-b094-e92efae38249

13 years ago2 new cvars: sv_gameplayfix_unstickentities and sv_gameplayfix_unstickplayers to...
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

13 years agocvar: csqc_usedemoprogs
divverent [Sat, 20 Aug 2011 16:46:20 +0000 (16:46 +0000)]
cvar: csqc_usedemoprogs

allows to use the file system csprogs.dat for demo playback, mainly useful
for debugging csqc issues that happen when playing back a demo

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11288 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodpshaderkill enhancements
divverent [Sat, 20 Aug 2011 15:41:23 +0000 (15:41 +0000)]
dpshaderkill enhancements

"Kill" current shader:
dpshaderkillifcvar r_foo == 42
dpshaderkillifcvar r_foo != 42
dpshaderkillifcvar r_foo < 42
dpshaderkillifcvar r_foo > 42
dpshaderkillifcvar r_foo <= 42
dpshaderkillifcvar r_foo >= 42

"Un-kill" current shader (unsets the kill flag):
dpnoshaderkillifcvar r_foo == 42
dpnoshaderkillifcvar r_foo != 42
dpnoshaderkillifcvar r_foo < 42
dpnoshaderkillifcvar r_foo > 42
dpnoshaderkillifcvar r_foo <= 42
dpnoshaderkillifcvar r_foo >= 42

Also, shader override logic is modified so killed shaders can be used to make
alternatives, e.g. switching between two shader definitions based on cvars:
- killed shaders never override other shaders, but show no warning
- non-killed shaders override killed shaders
- non-killed shaders still do not override other non-killed shaders

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11287 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadded dpshaderkillifcvar and dpshaderkillifcvarzero keywords for
havoc [Sat, 20 Aug 2011 13:29:21 +0000 (13:29 +0000)]
added dpshaderkillifcvar and dpshaderkillifcvarzero keywords for
shaders, their parameter is a custom cvar name of your choice

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11286 d7cf8633-e32d-0410-b094-e92efae38249