]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
divverent [Sat, 27 Feb 2010 15:09:43 +0000 (15:09 +0000)]
attempt to fix the includes for win32
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10019
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
715d02cb31a0bf038288cd3a04372c959ea2648c
divverent [Sat, 27 Feb 2010 15:07:21 +0000 (15:07 +0000)]
fix another win32 time typo
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10018
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
83999e441c2aee1fc3b940c890597d15b5d72663
divverent [Sat, 27 Feb 2010 15:04:07 +0000 (15:04 +0000)]
fix two remaining uses of sys_usetimegettime
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10017
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
95ea7cd538122ca0fc56dec276c6900ef47ae56d
divverent [Fri, 26 Feb 2010 15:44:03 +0000 (15:44 +0000)]
also: sys_usesdldelay for using SDL_Delay() for sleeping instead of something better system provided
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10014
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bf7b5f9f849025aaa0b3c2321b6e1fc9988cc63b
divverent [Fri, 26 Feb 2010 15:43:58 +0000 (15:43 +0000)]
refactor timing, so that timing code is in sys_shared.c.
Changes in behaviour: Win32 now prefers select() (PLEASE TEST), SDL timers can be overridden by sys_usequeryperformancecounter or sys_useclockgettime, new cvar sys_debugtime
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10013
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
913039faa5b22651954fe10a148ff1e87e4b84fd
divverent [Fri, 26 Feb 2010 15:43:54 +0000 (15:43 +0000)]
Revert "added linux timing code to SDL client for more accurate r_speeds reports"
This reverts commit
ef4adee42c844523c889cbc6c19d2da940f00ec6 .
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10012
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
abc8a1eeeedc13556c83ba40d5d33d996a66dddd
havoc [Fri, 26 Feb 2010 13:58:35 +0000 (13:58 +0000)]
added linux timing code to SDL client for more accurate r_speeds reports
(sys_usetimegettime and sys_useclockgettime apply, set both to 0 to use
SDL_GetTicks instead)
added support for sys_usenoclockbutbenchmark in SDL client
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10011
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef4adee42c844523c889cbc6c19d2da940f00ec6
havoc [Fri, 26 Feb 2010 12:03:37 +0000 (12:03 +0000)]
undo an edit in r9537 that caused it to be possible to walk through a
narrow gap in toxic in Nexuiz near the rocket launcher
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10009
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fa8c2da3b1ce02a796fafd6fc91f7a7f50d1fb5e
havoc [Fri, 4 Dec 2009 16:13:26 +0000 (16:13 +0000)]
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::merge=
5b7ac1706712977bbc0297d2d53294e73574c7cd
eihrul [Sat, 27 Feb 2010 02:04:38 +0000 (02:04 +0000)]
added 6x6 pcf option for people with too much framerate
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10016
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e3a883b6057a6bf3e4105e2f127576a5142a73cc
divverent [Fri, 26 Feb 2010 20:32:24 +0000 (20:32 +0000)]
fix strstrofs with unicode
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10015
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7310ccc56ef9562bac8d52df25ed47b826c02a49
havoc [Fri, 26 Feb 2010 12:30:07 +0000 (12:30 +0000)]
don't bother calling Collision_ValidateBrush when creating box brushes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10010
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
26c627af105b03b2e1f5d74279163712ea546749
havoc [Thu, 25 Feb 2010 23:10:15 +0000 (23:10 +0000)]
added collision_debug_tracelineasbox cvar to work around problems with
traceline on q3bsp, disabled by default due to performance being worse
but should aid in debugging the traceline problems
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10008
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
af7e237a4e6bdaab9a340a61a76ea314dff5624a
eihrul [Thu, 25 Feb 2010 18:47:26 +0000 (18:47 +0000)]
magical instruction sequence that works on both GL_ARB_texture_gather and GL_AMD_texture_texture4
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10007
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
23dca6dfc6b7d92aa2f12dc50fa6e18c85b3895a
havoc [Thu, 25 Feb 2010 16:16:46 +0000 (16:16 +0000)]
added dpmeshcollisions keyword in shader parsing, this causes all
rendering triangles of the affected surfaces to be added to the BIH
system, so that q3map2's misc_model collision flag can be turned off,
greatly reducing bsp size and memory usage, as well as possibly
improving collisions (no need to reconstruct points from planes)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10006
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
63bd4cc6bae869cbcd1ef49d27687184c9168fb0
havoc [Thu, 25 Feb 2010 16:14:13 +0000 (16:14 +0000)]
make sure r_glsl_permutation and r_cg_permutation variables are NULL
when renderer is started or shuts down
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10005
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
81635076d3f07502c9364aa258a08eb51913ba7b
eihrul [Thu, 25 Feb 2010 16:12:37 +0000 (16:12 +0000)]
attempting workaround for coord rounding incompatibilities between GL_ARB_texture_gather (nvidia) and GL_AMD_texture_texture4 (ati)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10004
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
34690453e94ce3bf4f752699efd64f97686fc1d1
havoc [Thu, 25 Feb 2010 16:11:50 +0000 (16:11 +0000)]
fix crash when MAX_DLIGHTS is hit and a trail effect tries to add a
dlight
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10003
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
87af9c2ada6e612040e77f1291f75c5ff15ae031
havoc [Thu, 25 Feb 2010 16:11:13 +0000 (16:11 +0000)]
particle geometry can now be rotated for more variety, and can spin too
added rotate command in effectinfo.txt which specifies min/max starting
angle and min/max rotation speed (spin)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10002
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bb92f370420bd006ad8b5e5eceb25439a4c9b429
havoc [Thu, 25 Feb 2010 16:01:54 +0000 (16:01 +0000)]
use CONFIGFILENAME and STARTCONFIGFILENAME macros instead of config.cfg
and quake.rc
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10000
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b530da0ed507718834d845824a344c7a0d14cfcf
havoc [Thu, 25 Feb 2010 15:58:10 +0000 (15:58 +0000)]
added cl_particles_collisions cvar to allow collisions to be turned off
for performance testing
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9999
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
30b08d7326179215b9ba0d2964aacfdfb07e1f58
havoc [Thu, 25 Feb 2010 15:55:47 +0000 (15:55 +0000)]
add several more R_TimeReport calls for better analysis of csqc time
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9998
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
88d7d61be53c082f488ce7e1f25de1e095ed4fdf
havoc [Thu, 25 Feb 2010 15:50:24 +0000 (15:50 +0000)]
don't bother calling Mod_ForName in client precache parsing if server
already loaded them in a local game
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9997
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f170ee3a587ffab1f06680de213b033838cb0b8a
havoc [Thu, 25 Feb 2010 07:32:04 +0000 (07:32 +0000)]
changes to rtlight surface culling:
SVBSP culling mode now also checks PVS (not sure why this helps)
no longer rejects backfaces in light culling (fixes several glitches in
start.bsp and elsewhere - not sure why the light would be considered
behind these triangles though)
optimized svbsp building conditions a bit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9996
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9daa8124711b6014029dc4d08d5b9ceefc6207e0
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