]>
git.xonotic.org Git - xonotic/darkplaces.git/log
eihrul [Thu, 25 Feb 2010 06:31:44 +0000 (06:31 +0000)]
fix signed vs. unsigned comparison warning in GL_TextureMode_f
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9995
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d032cfb5ca1e47238f2bd96886793c21547f0605
vortex [Sun, 21 Feb 2010 01:52:02 +0000 (01:52 +0000)]
Offsetmapping now could be customized on per-texture basis. Added mod_q3shader_default_offsetmapping cvar which is 1 by default (offsetmapping is on by default on all surfs), and 0 (only shader-set). New q3shader keyword "dp_offsetmapping <type> <scale>". Typical example: "dp_offsetmapping default 2". Types are "off", "default" (legacy cvar-based behavior), "linear" and "relief". Linear/relief is forced modes that ignores r_glsl_offsetmapping_reliefmapping.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9993
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7995f9f34c59e9f4a33a549d5bee58c5af43ea11
divverent [Mon, 22 Feb 2010 18:33:57 +0000 (18:33 +0000)]
fix degenerate triangle elimination
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9994
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a90442567b871a66f6e70e4747ea5ebf9be43bce
motorsep [Sat, 20 Feb 2010 18:31:50 +0000 (18:31 +0000)]
+some tune ups for Steel Storm screenshot prefix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9992
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
293060f59a848ee45283a35bff42c8d606673f14
havoc [Sat, 20 Feb 2010 14:03:14 +0000 (14:03 +0000)]
fixed BIH line clipping and enabled it, BIH is now faster than BSP
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9991
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c02ebe7d779742be5ab23638b5f29c9da715d797
havoc [Sat, 20 Feb 2010 13:31:40 +0000 (13:31 +0000)]
slight improvement to BIH recursion speeds by checking for box overlap
on every node (in addition to the side check)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9990
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
969efaea336f33793b6c35cea05f595f4d9e0f03
havoc [Sat, 20 Feb 2010 12:42:59 +0000 (12:42 +0000)]
added server and client timing data to r_speeds 2
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9989
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
dfe5470e06bc2b567cf21f1e3bea24567e901094
havoc [Fri, 19 Feb 2010 15:10:54 +0000 (15:10 +0000)]
fix more cg shader errors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9988
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cac93010a96f10cce2f2c1e75624138beb67d678
havoc [Fri, 19 Feb 2010 14:45:49 +0000 (14:45 +0000)]
fix two compile errors in cg shader
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9987
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1190e59ac9da31cd10085b172858b91112cb5695
havoc [Thu, 18 Feb 2010 12:11:48 +0000 (12:11 +0000)]
don't error out if external lightmap sizes mismatch, just print a
warning and ignore the mismatching one and any later ones
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9986
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a62eaee164fc07bb7829eaf44d1ea064a72e6ec
divverent [Thu, 18 Feb 2010 11:39:49 +0000 (11:39 +0000)]
new argument "force" to gl_texturemode for more augenkrebs fun (and e.g. debugging lightmaps)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9985
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ccc452866edbf84f189214c15bb4ef373d7d8385
havoc [Thu, 18 Feb 2010 06:25:26 +0000 (06:25 +0000)]
moved BIH_LEAF from bih_nodetype_t to bih_leaftype_t
renamed BIH_LEAF to BIH_BRUSH
renamed BIH_LEAF + 1 to BIH_COLLISIONTRIANGLE
renamed BIH_LEAF + 2 to BIH_RENDERTRIANGLE
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9984
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c47771198ec4b5144616f28a9774038a0767b3da
havoc [Thu, 18 Feb 2010 06:23:28 +0000 (06:23 +0000)]
move RESTRICT keyword define to qtypes.h and add it to all the
AnimateVertices functions to hush a warning in MSVC
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9983
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3d71dc6b3c36b9ae98ecdcb30edd8c8a7515e553
havoc [Thu, 18 Feb 2010 06:10:59 +0000 (06:10 +0000)]
added RF_FULLBRIGHT and RF_NOSHADOW renderflags for CSQC
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9982
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
72943b86b04da4f0ee7b4074287ec3743b8cd077
havoc [Thu, 18 Feb 2010 06:10:03 +0000 (06:10 +0000)]
fix a couple enum mixed with int warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9981
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d7ed34c18e0b6c5139faf743b613a473d419ea27
havoc [Thu, 18 Feb 2010 06:09:40 +0000 (06:09 +0000)]
add bih.[ch] to MSVC projects
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9980
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
001e49ea761abfc2982a5999e102b6bfe83a4e50
havoc [Thu, 18 Feb 2010 04:01:53 +0000 (04:01 +0000)]
set supercontents and surfaceflags on models not using shaders
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9978
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
caf55d8aa7707c0e3346fa904c9ebf179b2645c2
havoc [Thu, 18 Feb 2010 03:57:04 +0000 (03:57 +0000)]
make model collisions work when q3 shaders are used (by calculating
supercontents based on surfaceparm)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9977
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
147d25bd9ce27ac9ce1072c57db570ac974e73f0
havoc [Thu, 18 Feb 2010 01:02:28 +0000 (01:02 +0000)]
added some #if 0 test cases for BSP collision culling, to allow testing
the accuracy of the culling code by bypassing the optimized code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9976
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4671df4300aefb686ca7e97c282bfcc19b5760b1
havoc [Thu, 18 Feb 2010 00:51:09 +0000 (00:51 +0000)]
made the old BSP collision code check bounding boxes of brushes and
triangle meshes (curves) before colliding with them
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9975
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
356fb1124ed6dc4cb9482bf6f58b05395b7a7a7e
havoc [Thu, 18 Feb 2010 00:25:56 +0000 (00:25 +0000)]
disable broken Mod_CollisionBIH_TracePoint_Mesh and
Mod_CollisionBIH_PointSuperContents_Mesh, they need more advanced
triangle checks to function properly
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9974
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e1c223ca762105be0da1da573e00510759beb5e3
havoc [Thu, 18 Feb 2010 00:23:50 +0000 (00:23 +0000)]
made BIH collision culling support the mod_q3bsp_curves_collisions cvar
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9973
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1c47596aa012eb77b1e907df896ef42ee0eac731
havoc [Thu, 18 Feb 2010 00:22:51 +0000 (00:22 +0000)]
added mod_recalculatenodeboxes cvar to allow this behavior to be
disabled (but it defaults 1 as before)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9972
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0c0acac545fce47b0c80982fccfccc2390f09546
havoc [Thu, 18 Feb 2010 00:20:36 +0000 (00:20 +0000)]
don't check mod_collision_bih in r_showcollisionbrushes because the old
code path was removed
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9971
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1844b8202f22125f8fd064dc4161274149c43199
havoc [Wed, 17 Feb 2010 18:27:58 +0000 (18:27 +0000)]
deal with colbrushf == NULL cases in Mod_MakeCollisionBIH
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9970
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
63993d928ff59adb9ceaef3f0287422dd571f852
divverent [Wed, 17 Feb 2010 14:35:33 +0000 (14:35 +0000)]
fix getsurfacetriangle on a submodel
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9969
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
00f0f92f5a3b0410e7ab8d6d88d96950c6c40aa8
havoc [Wed, 17 Feb 2010 09:19:46 +0000 (09:19 +0000)]
added mod_q1bsp_polygoncollisions cvar (off by default, because it
disables clip brushes in the bsp)
added BIH collision optimization to all model formats if the model is
not animated, this should mean that model collisions are much faster
(when used with SOLID_BSP and such)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9968
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
be63e498406167cfaec398888d8b3dd0d02d5fc2
eihrul [Wed, 17 Feb 2010 08:45:57 +0000 (08:45 +0000)]
Mod_Decompile_SMD blend weight fixes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9967
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
96c3530b7406fd52b113fb5441afa9ed56147518
eihrul [Wed, 17 Feb 2010 07:21:41 +0000 (07:21 +0000)]
store blend weights as unsigned char data
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9966
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f19764dcfe28fe674266b09fe9a36c05fa847f7f
havoc [Wed, 17 Feb 2010 06:55:00 +0000 (06:55 +0000)]
implemented and debugged BIH (Bounding Interval Hierarchy) code, more
optimizations possible but this is a good start
mod_collision_bih cvar added, defaults to 0 because it is not yet
consistently faster than q3bsp collisions
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9965
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a5c12e5524c2af491c483e0207f48524f1cf072a
eihrul [Wed, 17 Feb 2010 06:23:18 +0000 (06:23 +0000)]
don't use dummy entries for single-bone blend palette entries
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9964
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cec49d4c10a7ef2615e9f3455cc8f321f82410cd
havoc [Wed, 17 Feb 2010 04:22:08 +0000 (04:22 +0000)]
don't crash if the model produces no shadowmesh (no geometry)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9963
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
97868372306c5d4ff7af54396ce62700b87fa11d
motorsep [Wed, 17 Feb 2010 03:32:40 +0000 (03:32 +0000)]
+ added bih.c and bih.h files into SDL project file for DevCPP
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9962
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e58037b0fc3256a7e53b4e699020573b18e06129
havoc [Wed, 17 Feb 2010 03:14:12 +0000 (03:14 +0000)]
don't error out when Mod_Q3BSP_LoadTriangles is called on a map with no
vertexes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9961
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ea1bc9587de3d3769cf1121f8d90e5e17dba4ab3
havoc [Wed, 17 Feb 2010 03:03:55 +0000 (03:03 +0000)]
fix two typos in Mod_Q3BSP_LoadTriangles errors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9960
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
761f3d4231915fe6bfb6909a4e4459f08d641f94
havoc [Wed, 17 Feb 2010 02:40:15 +0000 (02:40 +0000)]
fix unaligned memory access crash on skeletal models (allocating things
in the wrong order in a large block allocation)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9959
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a3a7bce97e32c71f28fcd49f5b83e41ba03c483a
eihrul [Tue, 16 Feb 2010 14:21:39 +0000 (14:21 +0000)]
make R_Shadow_CullFrustumSides assume infinite far clip
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9958
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fe792ae624fac2641a131061f44ba8589f5b2a69
havoc [Mon, 15 Feb 2010 12:56:48 +0000 (12:56 +0000)]
implementing Bounding Interval Hierarchy collision culling trees for
q3bsp, not used yet
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9957
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8c4a05a0e34eb4c21be65315d58841c0f8268197
vortex [Sun, 14 Feb 2010 23:10:49 +0000 (23:10 +0000)]
r_shadows_shadowmapscale cvar which as a multiple to r_shadow_shadowmapping_precision for fake shadows. Useful since otho shadowmaps likes high resolution (to get rid of pixel bleeding effect) and quite cheap.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9956
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
862719557ab3fed44f0671bbd639d6c5440b9e70
divverent [Fri, 12 Feb 2010 15:04:54 +0000 (15:04 +0000)]
hide one's own refraction (NOT reflection)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9955
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c7ca06d4cfc3aa10eb1a21633f0443e4e81ecc53
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
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
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
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
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
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
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
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
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
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
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
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
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
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