]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
divverent [Tue, 26 Jan 2010 15:10:37 +0000 (15:10 +0000)]
fix a typo in FT2 font code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9863
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c2f460a1456df64aec32d5f8cc097156adee619b
divverent [Tue, 26 Jan 2010 11:21:20 +0000 (11:21 +0000)]
fix padding calculation in freetype postprocessing filter, saves memory as possibly smaller font maps can be used with baked text shadow
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9861
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
84b1b8f2ec20a6d08d3d51351c6b57dbce579995
divverent [Tue, 26 Jan 2010 06:23:53 +0000 (06:23 +0000)]
fix funny menu bug (why did it never happen for me)?
BTW, who would ever call a _f function from other stuff than console commands... that's sick.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9860
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1dc239f97a1e99a72d17de824029d3c95664669b
havoc [Mon, 25 Jan 2010 19:51:58 +0000 (19:51 +0000)]
changed DP_SMALLMEMORY compiles to use the standard NET_MAXMESSAGE value
because otherwise they can not play back demos
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9858
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cdd93e8c5f467a92d2104f87d1dac61dcd53de15
havoc [Mon, 25 Jan 2010 19:49:31 +0000 (19:49 +0000)]
allow linking to libvorbis
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9856
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c8cf0c5bbc5d8f0515a8c824aab7f5ad186db7d3
divverent [Mon, 25 Jan 2010 15:04:25 +0000 (15:04 +0000)]
fix sign errors in shadows
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9851
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f9ded58b753c4144d9ac31a345b65a6b6bdf1a51
divverent [Mon, 25 Jan 2010 15:02:56 +0000 (15:02 +0000)]
apply the font parameters at loadfont time, not map generation time
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9850
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b7ebd5e02477bf12fbb2cb6e3979fbf18d39e626
divverent [Mon, 25 Jan 2010 13:51:19 +0000 (13:51 +0000)]
only run the outline code if actually outlining :P
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9849
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
90f995e366f44806eed724459e0b6b219ffd1724
divverent [Mon, 25 Jan 2010 13:42:58 +0000 (13:42 +0000)]
r_font_postprocess_* cvars to render fonts similar to mplayer subtitles with a blurred outline (not default)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9848
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a264aa2dc7ac856f3d6b885f9b709ae65eb69e0f
divverent [Mon, 25 Jan 2010 08:12:29 +0000 (08:12 +0000)]
add a missing parameter to that function :P
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9847
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c6f88b6f94206e34ed2e322c0f2aa9831714b017
divverent [Mon, 25 Jan 2010 08:09:30 +0000 (08:09 +0000)]
freetype: add a function yet to be filled for font image postprocessing
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9846
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
79479aaabf6c764dc2cd4455ca14c3ef2bd3d736
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 4 Dec 2009 16:13:26 +0000 (16:13 +0000)]
UNMERGE
fixed a bug with sv_gameplayfix_nudgeoutofsolid where the player might
get put on the opposite side of a brush because of being very near the
plane that should be used for nudging, which caused it not to be
considered as a nudging plane
added some checks to ensure more consistency on trace direction (should
be able to swap start and end without startsolid trouble, at least less)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9537
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
5b7ac1706712977bbc0297d2d53294e73574c7cd
havoc [Sun, 24 Jan 2010 18:19:03 +0000 (18:19 +0000)]
attempt to fix white flicker when r_water is toggled
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9845
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
115601248b48a32c5ab5a078a07a4e5f36ea7850