]> icculus.org git repositories - divverent/darkplaces.git/log
divverent/darkplaces.git
14 years agomore statics...
havoc [Thu, 11 Feb 2010 05:33:20 +0000 (05:33 +0000)]
more statics...

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

14 years agorearrange particle_t fields to save memory
havoc [Thu, 11 Feb 2010 05:01:56 +0000 (05:01 +0000)]
rearrange particle_t fields to save memory
disabled delayedcollisions support on particles to save memory

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

14 years agoadded texturename parameter in particles/particlefont.txt
havoc [Thu, 11 Feb 2010 04:44:36 +0000 (04:44 +0000)]
added texturename parameter in particles/particlefont.txt
fixed bug where alphatest was sometimes used on particles as a result of
previous transparent materials rendered before it
changed MAX_PARTICLETEXTURES to 256 because a byte index is used

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

14 years agosort particles by effect origin rather than particle origin, this
havoc [Thu, 11 Feb 2010 03:46:30 +0000 (03:46 +0000)]
sort particles by effect origin rather than particle origin, this
improves fps in bigass1 by 8.3% in my tests

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

14 years ago+ Added Steel Storm game
motorsep [Wed, 10 Feb 2010 21:16:52 +0000 (21:16 +0000)]
+ Added Steel Storm game
+ Added ability to play fake CD tracks from /music or /music/cdtracks

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

14 years agoExperimental feature of saving buffers within savegame files (in extended section...
vortex [Wed, 10 Feb 2010 20:05:46 +0000 (20:05 +0000)]
Experimental feature of saving buffers within savegame files (in extended section). Code needs cleaning (since i'm not really understand concept of expandable arrays). Upgraded buf_create() to optional buf_create(string,float) string being a buffer format (yet another experimental feature that will be tested in future), should be "string" if presented. Second float is buffer flags, currently only flag 1 (save in savegames) are used. There is idea for another buffer flag which will allow buffer to pass across levels, saving handle number and contents (bufhandle could be passed as one of parm*).

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

14 years agofix missing restrict keyword
eihrul [Wed, 10 Feb 2010 03:53:27 +0000 (03:53 +0000)]
fix missing restrict keyword

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

14 years agoyet faster VSDCT instruction sequences
eihrul [Tue, 9 Feb 2010 04:53:49 +0000 (04:53 +0000)]
yet faster VSDCT instruction sequences

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

14 years agoWorkaround F1/F12 binding for GAME_BLOODOMNICIDE
vortex [Mon, 8 Feb 2010 20:33:11 +0000 (20:33 +0000)]
Workaround F1/F12 binding for GAME_BLOODOMNICIDE

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

14 years agoshorter non-VSDCT GetShadowMapTC
eihrul [Sun, 7 Feb 2010 22:54:30 +0000 (22:54 +0000)]
shorter non-VSDCT GetShadowMapTC

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

14 years agofix r_showsurfaces 3 again
divverent [Sun, 7 Feb 2010 20:13:08 +0000 (20:13 +0000)]
fix r_showsurfaces 3 again

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

14 years agoattempting cheaper non-VSDCT projection
eihrul [Sun, 7 Feb 2010 19:04:11 +0000 (19:04 +0000)]
attempting cheaper non-VSDCT projection

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

14 years agoapply bias to orthographic shadowmaps
eihrul [Sun, 7 Feb 2010 06:56:16 +0000 (06:56 +0000)]
apply bias to orthographic shadowmaps

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

14 years agodon't shift the shadowmapping focus based on view angle when r_shadows_focus is used
eihrul [Fri, 5 Feb 2010 22:32:56 +0000 (22:32 +0000)]
don't shift the shadowmapping focus based on view angle when r_shadows_focus is used

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

14 years agoallow multiple steps in one move
havoc [Sun, 31 Jan 2010 00:26:30 +0000 (00:26 +0000)]
allow multiple steps in one move

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

14 years agowhen using PBLEND_INVMOD or PBLEND_ADD modes for particles/decals, make sure alpha...
eihrul [Mon, 1 Feb 2010 22:46:03 +0000 (22:46 +0000)]
when using PBLEND_INVMOD or PBLEND_ADD modes for particles/decals, make sure alpha is clamped to <= 1 when multiplying color

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

14 years agofix 9924 REALLY, this time transforming dp_ into dp in ALL shader parsing instances
divverent [Fri, 5 Feb 2010 12:15:31 +0000 (12:15 +0000)]
fix 9924 REALLY, this time transforming dp_ into dp in ALL shader parsing instances

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

14 years agofix r_shadows_focus cvar so it is properly relative to view directions
eihrul [Fri, 5 Feb 2010 04:17:40 +0000 (04:17 +0000)]
fix r_shadows_focus cvar so it is properly relative to view directions

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

14 years agoflip projection and sample matrices for R_DrawModelShadowMaps to avoid cull face...
eihrul [Fri, 5 Feb 2010 03:41:01 +0000 (03:41 +0000)]
flip projection and sample matrices for R_DrawModelShadowMaps to avoid cull face usage

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

14 years agoinvert cull face settings when drawing model shadowmaps
eihrul [Fri, 5 Feb 2010 03:02:29 +0000 (03:02 +0000)]
invert cull face settings when drawing model shadowmaps

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

14 years agofix unseen ents + r_shadows check in R_View_UpdateEntityLight
eihrul [Fri, 5 Feb 2010 02:49:23 +0000 (02:49 +0000)]
fix unseen ents + r_shadows check in R_View_UpdateEntityLight

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

14 years agoadded r_shadows_focus cvar that allows a vector offset to be added to the r_shadows...
eihrul [Fri, 5 Feb 2010 02:17:29 +0000 (02:17 +0000)]
added r_shadows_focus cvar that allows a vector offset to be added to the r_shadows shadowmapping focus

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

14 years agotry to cache fewer animations for entities when r_shadows is used by using cull box
eihrul [Fri, 5 Feb 2010 01:09:58 +0000 (01:09 +0000)]
try to cache fewer animations for entities when r_shadows is used by using cull box

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

14 years agofaster skeletal animation based on blend-palettes
eihrul [Thu, 4 Feb 2010 23:42:46 +0000 (23:42 +0000)]
faster skeletal animation based on blend-palettes

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

14 years agofixed calculation of model shadowmap cull origin
eihrul [Thu, 4 Feb 2010 09:16:02 +0000 (09:16 +0000)]
fixed calculation of model shadowmap cull origin

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

14 years agomore accurate cull boxes on R_DrawModelShadowMaps
eihrul [Thu, 4 Feb 2010 04:02:48 +0000 (04:02 +0000)]
more accurate cull boxes on R_DrawModelShadowMaps

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

14 years agodon't render shadowmaportho onto noselfshadow entities to prevent hudgun ugliness...
eihrul [Thu, 4 Feb 2010 02:34:54 +0000 (02:34 +0000)]
don't render shadowmaportho onto noselfshadow entities to prevent hudgun ugliness and such

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

14 years agomoved pants to 7, reflectmask to 5, reflectcube to 6, shadowmaportho to 15
eihrul [Thu, 4 Feb 2010 02:10:43 +0000 (02:10 +0000)]
moved pants to 7, reflectmask to 5, reflectcube to 6, shadowmaportho to 15

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

14 years agoreuse screenspace depth texture unit for orthographic shadowmaps so they can coexist...
eihrul [Thu, 4 Feb 2010 01:45:36 +0000 (01:45 +0000)]
reuse screenspace depth texture unit for orthographic shadowmaps so they can coexist with deferred lightmapping

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

14 years agoupdate CG shader for shadowmaportho
eihrul [Thu, 4 Feb 2010 00:46:03 +0000 (00:46 +0000)]
update CG shader for shadowmaportho

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

14 years agowhen r_shadow_shadowmapping is enabled, r_shadows uses shadowmaps instead of stencils
eihrul [Thu, 4 Feb 2010 00:18:13 +0000 (00:18 +0000)]
when r_shadow_shadowmapping is enabled, r_shadows uses shadowmaps instead of stencils

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

14 years agofix typo in previous commit
divverent [Wed, 3 Feb 2010 14:23:24 +0000 (14:23 +0000)]
fix typo in previous commit

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

14 years agofix some inconsistent naming: some shader parameters are named like "dpshadow", some...
divverent [Wed, 3 Feb 2010 14:22:41 +0000 (14:22 +0000)]
fix some inconsistent naming: some shader parameters are named like "dpshadow", some others like "dp_glossintensitymod". Add code to make all of these parameters work both with "dp" and "dp_" prefix. New shader scripts should use "dpshadow" notation.

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

14 years agostrip proquake QC messages if in Quake protocol
divverent [Wed, 3 Feb 2010 06:35:45 +0000 (06:35 +0000)]
strip proquake QC messages if in Quake protocol

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

14 years agochange default cl_netfps from 20 to 72
havoc [Wed, 3 Feb 2010 02:12:30 +0000 (02:12 +0000)]
change default cl_netfps from 20 to 72

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

14 years agofactored R_Shadow_MakeShadowMap out of R_Shadow_RenderMode_ShadowMap so it can be...
eihrul [Wed, 3 Feb 2010 02:09:11 +0000 (02:09 +0000)]
factored R_Shadow_MakeShadowMap out of R_Shadow_RenderMode_ShadowMap so it can be reused

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

14 years agoreuse batchsurfacelist between R_Q1BSP_DrawShadowMap and R_Q1BSP_DrawLight
eihrul [Wed, 3 Feb 2010 01:00:36 +0000 (01:00 +0000)]
reuse batchsurfacelist between R_Q1BSP_DrawShadowMap and R_Q1BSP_DrawLight

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

14 years agocheck if a model's textures have deforms that need normals/tangents at load-time...
eihrul [Mon, 1 Feb 2010 10:15:46 +0000 (10:15 +0000)]
check if a model's textures have deforms that need normals/tangents at load-time, and pass in appropriate flags to RSurf_ActiveModelEntity based on this when rendering models with depthonly (fixes Nexuiz flag z-fighting)

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

14 years agoATTN VorteX: add a new field stainsize and stainalpha to effectinfo - TODO: particle...
divverent [Mon, 1 Feb 2010 09:58:33 +0000 (09:58 +0000)]
ATTN VorteX: add a new field stainsize and stainalpha to effectinfo - TODO: particle spawners need that global declared in QC now, make that global optional somehow maybe
Declarations to be added:
var float particle_stainalpha = 1;
var float particle_stainsize = 1;

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

14 years agomake Matrix_ToBonePose6s check the podality of quaternions rather than assuming they...
eihrul [Mon, 1 Feb 2010 08:02:27 +0000 (08:02 +0000)]
make Matrix_ToBonePose6s check the podality of quaternions rather than assuming they are always positive from Matrix4x4_ToOrigin3Quat4Float

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

14 years agohandle case where trace is zero in Matrix4x4_ToOrigin3Quat4Float
eihrul [Mon, 1 Feb 2010 06:18:26 +0000 (06:18 +0000)]
handle case where trace is zero in Matrix4x4_ToOrigin3Quat4Float

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

14 years agounsigned long vs. size_t printf format warning fix
eihrul [Mon, 1 Feb 2010 06:38:02 +0000 (06:38 +0000)]
unsigned long vs. size_t printf format warning fix

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

14 years agosize vs. int warning fix
eihrul [Mon, 1 Feb 2010 06:34:00 +0000 (06:34 +0000)]
size vs. int warning fix

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

14 years agofix unsigned vs. signed comparison warnings
eihrul [Mon, 1 Feb 2010 06:29:40 +0000 (06:29 +0000)]
fix unsigned vs. signed comparison warnings

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

14 years agoincrease sv_areagrid_mingridsize from 64 to 128 to reduce culling
havoc [Mon, 1 Feb 2010 03:49:01 +0000 (03:49 +0000)]
increase sv_areagrid_mingridsize from 64 to 128 to reduce culling
overhead in most cases

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

14 years agofix off-by-one bug with bone numbers in skel_build
havoc [Mon, 1 Feb 2010 03:45:11 +0000 (03:45 +0000)]
fix off-by-one bug with bone numbers in skel_build

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

14 years agouse less stack space
havoc [Mon, 1 Feb 2010 01:37:52 +0000 (01:37 +0000)]
use less stack space

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

14 years agofix some bugs with skeletonindex handling
havoc [Sun, 31 Jan 2010 23:12:33 +0000 (23:12 +0000)]
fix some bugs with skeletonindex handling

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

14 years agofix sky drawing really this tiem
divverent [Mon, 1 Feb 2010 07:29:57 +0000 (07:29 +0000)]
fix sky drawing really this tiem

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

14 years agodisable showdebug while drawing sky, yields more flexibility when using showsurfaces...
divverent [Fri, 29 Jan 2010 14:35:27 +0000 (14:35 +0000)]
disable showdebug while drawing sky, yields more flexibility when using showsurfaces (one can turn off sky separately using r_drawsky if one wishes so)

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

14 years agofix a compile error
havoc [Sun, 31 Jan 2010 23:29:51 +0000 (23:29 +0000)]
fix a compile error

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

14 years agofix more warnings
havoc [Sun, 31 Jan 2010 23:27:11 +0000 (23:27 +0000)]
fix more warnings

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

14 years agofix a bunch of warnings
havoc [Sun, 31 Jan 2010 23:15:03 +0000 (23:15 +0000)]
fix a bunch of warnings

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

14 years agofix a return value
divverent [Sun, 31 Jan 2010 21:01:13 +0000 (21:01 +0000)]
fix a return value

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

14 years agofix some useless use of PRVM_G_STRING in mvm_cmds.c
divverent [Sun, 31 Jan 2010 20:57:54 +0000 (20:57 +0000)]
fix some useless use of PRVM_G_STRING in mvm_cmds.c

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

14 years agomake ClientTime available to ALL shader permutations, not just postprocess, if the...
divverent [Sun, 31 Jan 2010 19:50:38 +0000 (19:50 +0000)]
make ClientTime available to ALL shader permutations, not just postprocess, if the shader defines it

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

14 years agoadded r_texture_convertsRGB_* cvars (default: OFF) which allow automatic
havoc [Sun, 31 Jan 2010 19:05:20 +0000 (19:05 +0000)]
added r_texture_convertsRGB_* cvars (default: OFF) which allow automatic
conversion of sRGB textures to linear at load (only affects external
textures - anything embedded in q1 formats is untouched because they
were authored in linear)

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

14 years agofix a bug with skel_create where it returned a bone number instead of a
havoc [Sun, 31 Jan 2010 18:43:13 +0000 (18:43 +0000)]
fix a bug with skel_create where it returned a bone number instead of a
skeleton number

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

14 years agoadded a check in r_cullentities_trace to always show entities if the eye
havoc [Sun, 31 Jan 2010 04:16:11 +0000 (04:16 +0000)]
added a check in r_cullentities_trace to always show entities if the eye
is inside their culling box

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

14 years agobugfix for skel_build returning the wrong value
havoc [Sun, 31 Jan 2010 03:26:44 +0000 (03:26 +0000)]
bugfix for skel_build returning the wrong value

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

14 years agobetter fix for r_drawviewmodel
havoc [Sat, 30 Jan 2010 23:28:10 +0000 (23:28 +0000)]
better fix for r_drawviewmodel

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

14 years agofix r_drawviewmodel
havoc [Sat, 30 Jan 2010 23:26:56 +0000 (23:26 +0000)]
fix r_drawviewmodel

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

14 years agoenable the separate CLVM_ and MVM_ExecuteProgram functions unless
havoc [Fri, 29 Jan 2010 21:15:54 +0000 (21:15 +0000)]
enable the separate CLVM_ and MVM_ExecuteProgram functions unless
DP_SMALLMEMORY is defined, because these functions are necessary for
proper profiling

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

14 years agoincrease world culling grid dimensions back to 128 (192KB 32bit, 384KB
havoc [Fri, 29 Jan 2010 20:12:43 +0000 (20:12 +0000)]
increase world culling grid dimensions back to 128 (192KB 32bit, 384KB
64bit), was 64 (48KB 32bit, 96KB 64bit)

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

14 years agoreduce world culling grid size back to what it was before (64 again)
havoc [Fri, 29 Jan 2010 20:10:58 +0000 (20:10 +0000)]
reduce world culling grid size back to what it was before (64 again)

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

14 years agodon't call StartPlaylist if index is -1 (disables playlists)
havoc [Sat, 30 Jan 2010 21:56:54 +0000 (21:56 +0000)]
don't call StartPlaylist if index is -1 (disables playlists)

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

14 years agoimplemented music playlist system with 10 playlists, automatic track
havoc [Fri, 29 Jan 2010 19:03:08 +0000 (19:03 +0000)]
implemented music playlist system with 10 playlists, automatic track
resume when switching between playlists (setting sampleposition to 0
will cause it to save and resume the position in the track, -1 restarts)
and random play options for each playlist
playlist system overrides normal cd console commands if index is not -1

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

14 years agofix a typo
havoc [Fri, 29 Jan 2010 12:22:56 +0000 (12:22 +0000)]
fix a typo

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

14 years agofix a typo
havoc [Fri, 29 Jan 2010 12:22:18 +0000 (12:22 +0000)]
fix a typo

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

14 years agochange protocol version table so that multiple numbers could correspond
havoc [Fri, 29 Jan 2010 11:39:46 +0000 (11:39 +0000)]
change protocol version table so that multiple numbers could correspond
to the same protocolversion_t if desired

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

14 years agofix line endings (CRLF -> LF)
havoc [Fri, 29 Jan 2010 09:59:56 +0000 (09:59 +0000)]
fix line endings (CRLF -> LF)

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

14 years agopatch from Paul Jackson for per-pixel varying specular power in textures
havoc [Fri, 29 Jan 2010 09:47:28 +0000 (09:47 +0000)]
patch from Paul Jackson for per-pixel varying specular power in textures
(gloss alpha channel controls this), it is a simple fraction of the
current gloss exponent for the material

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

14 years agofix areagrid mins/maxs calculation (improves fps on peace6dot5 a LOT)
divverent [Sat, 30 Jan 2010 20:33:29 +0000 (20:33 +0000)]
fix areagrid mins/maxs calculation (improves fps on peace6dot5 a LOT)

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

14 years agofix missing sqrt in sideways friction
divverent [Sat, 30 Jan 2010 18:27:17 +0000 (18:27 +0000)]
fix missing sqrt in sideways friction

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

14 years agomake CPMA air control code more logical
divverent [Sat, 30 Jan 2010 18:08:12 +0000 (18:08 +0000)]
make CPMA air control code more logical

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

14 years agomake CPMA_PM_AirControl more gamepad friendly. Otherwise unchanged.
divverent [Sat, 30 Jan 2010 09:46:47 +0000 (09:46 +0000)]
make CPMA_PM_AirControl more gamepad friendly. Otherwise unchanged.

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

14 years agofix a minor code bug that should never occur in the last commit ;)
divverent [Sat, 30 Jan 2010 08:11:50 +0000 (08:11 +0000)]
fix a minor code bug that should never occur in the last commit ;)

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

14 years agospeed clamping: sideways friction < 0 clamps against minimum possible backwards speed...
divverent [Sat, 30 Jan 2010 08:10:29 +0000 (08:10 +0000)]
speed clamping: sideways friction < 0 clamps against minimum possible backwards speed, airaccel_qw clamps against maximum possible forward speed, can behave like CPMA but with no strafejump bug

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

14 years agoanother dprintf
havoc [Fri, 29 Jan 2010 09:45:05 +0000 (09:45 +0000)]
another dprintf

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

14 years agoperform animation in getsurface* functions, to allow fully enumerating a model's...
divverent [Thu, 28 Jan 2010 16:18:59 +0000 (16:18 +0000)]
perform animation in getsurface* functions, to allow fully enumerating a model's current pose. CSQC-drawn model using polygon drawing and engine-side drawn model are now fully equivalent in geometry.

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

14 years agonudgeoutofsolid: check for bmodelstartsolid, not startsolid. Allows multiple player...
divverent [Wed, 27 Jan 2010 10:12:51 +0000 (10:12 +0000)]
nudgeoutofsolid: check for bmodelstartsolid, not startsolid. Allows multiple player entities to occupy the same spot, and then VOLUNTARILY walk out of each other (like before), and doesn't perform a forced high-velocity nudge.

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

14 years agoimplemented fake reflection cubemaps... requires that a .shader
havoc [Wed, 27 Jan 2010 05:30:44 +0000 (05:30 +0000)]
implemented fake reflection cubemaps...  requires that a .shader
specifies dpreflectcube with a cubemap prefix, and requires that the
material textures include a _reflect.tga image to mask the reflection
(roughly similar to _gloss texture)

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

14 years agomake getsurface* functions shared between VMs
divverent [Tue, 26 Jan 2010 11:32:14 +0000 (11:32 +0000)]
make getsurface* functions shared between VMs
add getsurfacenumtriangles, getsurfacetriangle

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

14 years agofaster surface culling check in light processing
havoc [Mon, 25 Jan 2010 19:51:04 +0000 (19:51 +0000)]
faster surface culling check in light processing
added the beginnings of code for caching Cg shaders on disk, the actual
caching is not implemented yet

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

14 years agoREALLY fix the ESC menu toggle
divverent [Wed, 27 Jan 2010 06:10:18 +0000 (06:10 +0000)]
REALLY fix the ESC menu toggle

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

14 years agoRevert "aaahh! let me use the menu, div0!"
divverent [Wed, 27 Jan 2010 06:10:12 +0000 (06:10 +0000)]
Revert "aaahh! let me use the menu, div0!"

This reverts commit 0c3fb702e1f1fac82c3b50c06664913fa05c8e8f.

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

14 years agoTry to fix a warning motorsep gets
divverent [Wed, 27 Jan 2010 05:23:20 +0000 (05:23 +0000)]
Try to fix a warning motorsep gets

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

14 years agodon't use pp = {};
havoc [Tue, 26 Jan 2010 23:51:37 +0000 (23:51 +0000)]
don't use pp = {};
don't use pp = {0};
use pp;

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

14 years agoaaahh! let me use the menu, div0!
sajt [Tue, 26 Jan 2010 23:51:20 +0000 (23:51 +0000)]
aaahh! let me use the menu, div0!

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

14 years agofix compile error in visual c++
sajt [Tue, 26 Jan 2010 23:42:17 +0000 (23:42 +0000)]
fix compile error in visual c++

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

14 years agoalways use fetch4 path for filtering if available
eihrul [Tue, 26 Jan 2010 22:51:39 +0000 (22:51 +0000)]
always use fetch4 path for filtering if available

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

14 years agofix uninitialized vars
eihrul [Tue, 26 Jan 2010 22:31:14 +0000 (22:31 +0000)]
fix uninitialized vars

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

14 years agosome bugfixes to mod_generatelightmaps that make it run on q1bsp
havoc [Tue, 26 Jan 2010 01:07:13 +0000 (01:07 +0000)]
some bugfixes to mod_generatelightmaps that make it run on q1bsp
(doesn't look right though)

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

14 years agoa slightly more robust error return check
havoc [Mon, 25 Jan 2010 19:49:08 +0000 (19:49 +0000)]
a slightly more robust error return check

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

14 years agofix a bug where submodels are not uploaded in a VBO which can cause bad
havoc [Mon, 25 Jan 2010 19:48:39 +0000 (19:48 +0000)]
fix a bug where submodels are not uploaded in a VBO which can cause bad
performance on some drivers

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

14 years agoshuffle fields in msurface_t to reduce memory usage on 64bit
havoc [Mon, 25 Jan 2010 15:29:42 +0000 (15:29 +0000)]
shuffle fields in msurface_t to reduce memory usage on 64bit

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

14 years agofix water rendering bugs (was rendering water surface over its own view)
havoc [Mon, 25 Jan 2010 15:10:40 +0000 (15:10 +0000)]
fix water rendering bugs (was rendering water surface over its own view)

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

14 years agoremove support for GL_EXT_compiled_vertex_array extension
havoc [Tue, 5 Jan 2010 09:33:35 +0000 (09:33 +0000)]
remove support for GL_EXT_compiled_vertex_array extension

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

14 years agomoved R_Mesh_TexCoordPointer, R_Mesh_ColorPointer, GL_BlendFunc, and
havoc [Mon, 4 Jan 2010 19:29:33 +0000 (19:29 +0000)]
moved R_Mesh_TexCoordPointer, R_Mesh_ColorPointer, GL_BlendFunc, and
GL_AlphaTest calls to R_SetupShader_Surface for a slight speed gain
(less texcoord arrays active now in some cases)

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

14 years agoin FT2 postprocess code, fix an integer overflow and a coordinate reversal
divverent [Tue, 26 Jan 2010 16:50:05 +0000 (16:50 +0000)]
in FT2 postprocess code, fix an integer overflow and a coordinate reversal

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