]> icculus.org git repositories - divverent/darkplaces.git/log
divverent/darkplaces.git
14 years agofix a compile error
havoc [Sun, 31 Jan 2010 23:29:51 +0000 (23:29 +0000)]
fix a compile error

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

This reverts commit 0c3fb702e1f1fac82c3b50c06664913fa05c8e8f.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

14 years agofix a typo in FT2 font code
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

14 years agofix padding calculation in freetype postprocessing filter, saves memory as possibly...
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

14 years agofix funny menu bug (why did it never happen for me)?
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

14 years agochanged DP_SMALLMEMORY compiles to use the standard NET_MAXMESSAGE value
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

14 years agoallow linking to libvorbis
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

14 years agofix sign errors in shadows
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

14 years agoapply the font parameters at loadfont time, not map generation time
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

14 years agoonly run the outline code if actually outlining :P
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

14 years agor_font_postprocess_* cvars to render fonts similar to mplayer subtitles with a blurre...
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

14 years agoadd a missing parameter to that function :P
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

14 years agofreetype: add a function yet to be filled for font image postprocessing
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

14 years agoUNMERGE
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

14 years agoattempt to fix white flicker when r_water is toggled
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

14 years agorenamed r_frame to r_textureframe for better readability and made it
havoc [Mon, 4 Jan 2010 20:06:03 +0000 (20:06 +0000)]
renamed r_frame to r_textureframe for better readability and made it
increment on every scene render

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

14 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 4 Jan 2010 20:06:03 +0000 (20:06 +0000)]
UNMERGE
renamed r_frame to r_textureframe for better readability and made it
increment on every scene render

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9778 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=91fba1f2da941d5a9229048c07cce889774d8d03

14 years agodon't store pointers for serverlist_viewlist, because they become
havoc [Sun, 24 Jan 2010 17:02:53 +0000 (17:02 +0000)]
don't store pointers for serverlist_viewlist, because they become
invalid after serverlist_cache is reallocated

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

14 years agofix enginestring use in mvm_cmds.c causing a crash regarding server list
divverent [Sun, 24 Jan 2010 13:43:31 +0000 (13:43 +0000)]
fix enginestring use in mvm_cmds.c causing a crash regarding server list

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

14 years agodon't try to load kerning information when only checking for a working size to load
blub [Sun, 24 Jan 2010 13:09:13 +0000 (13:09 +0000)]
don't try to load kerning information when only checking for a working size to load

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

14 years agofix the bug I just fixed another time :P slight speedup, no other change from this
divverent [Wed, 20 Jan 2010 09:39:52 +0000 (09:39 +0000)]
fix the bug I just fixed another time :P slight speedup, no other change from this

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

14 years agofix typo in utf8 lib making characters U+1XXXX impossible
divverent [Wed, 20 Jan 2010 06:58:45 +0000 (06:58 +0000)]
fix typo in utf8 lib making characters U+1XXXX impossible

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

14 years agofix off-by-one bug rendering characters like U+0100
divverent [Tue, 19 Jan 2010 20:55:06 +0000 (20:55 +0000)]
fix off-by-one bug rendering characters like U+0100

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

14 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 4 Jan 2010 19:29:33 +0000 (19:29 +0000)]
UNMERGE
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::unmerge=5fd979a5cbde892830c4740fd23345bcf9fd8e0e

14 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 5 Jan 2010 09:33:35 +0000 (09:33 +0000)]
UNMERGE
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::unmerge=bc9063582a5b12986a3f70b4eaa9ffaf1568f735

14 years agoTwo new cvars for blood particles: decal alpha, decal random scaling (min/max)
vortex [Sun, 17 Jan 2010 21:41:49 +0000 (21:41 +0000)]
Two new cvars for blood particles: decal alpha, decal random scaling (min/max)
Protect against float values on stain colors in DP_CSQC_SPAWNPARTICLE

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

14 years agofix a warning
havoc [Mon, 18 Jan 2010 10:11:10 +0000 (10:11 +0000)]
fix a warning

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

14 years agofix VM_sprintf "%s" conversion when passed ""
divverent [Sun, 17 Jan 2010 18:59:57 +0000 (18:59 +0000)]
fix VM_sprintf "%s" conversion when passed ""

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

14 years agodon't reject render entities from being added just because of
havoc [Sat, 16 Jan 2010 16:21:11 +0000 (16:21 +0000)]
don't reject render entities from being added just because of
chase_active value, the renderer will filter them

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

14 years agodon't draw conback when the file is missing, behave as if
havoc [Wed, 13 Jan 2010 07:15:57 +0000 (07:15 +0000)]
don't draw conback when the file is missing, behave as if
scr_conbrightness is 0 in this case

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

14 years agoadd new pseudo variable $# containing the number of arguments to the alias
divverent [Tue, 12 Jan 2010 10:55:37 +0000 (10:55 +0000)]
add new pseudo variable $# containing the number of arguments to the alias

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

14 years agofix black models in fixed function rendering path
havoc [Tue, 12 Jan 2010 09:54:07 +0000 (09:54 +0000)]
fix black models in fixed function rendering path

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

14 years agofix typo in SV_GetEntityLocalTagMatrix, should fix attachment on MD3
divverent [Tue, 12 Jan 2010 07:32:05 +0000 (07:32 +0000)]
fix typo in SV_GetEntityLocalTagMatrix, should fix attachment on MD3
models

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

14 years agopatch from div0 for SPR_OVERHEAD sprites 'virtual perspective', looks better. Move...
vortex [Mon, 11 Jan 2010 21:45:06 +0000 (21:45 +0000)]
patch from div0 for SPR_OVERHEAD sprites 'virtual perspective', looks better. Move some parms into cvars (see r_overheadsprites*).

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

14 years agosorry, forgot to remove debug prints, fixing
vortex [Mon, 11 Jan 2010 20:23:59 +0000 (20:23 +0000)]
sorry, forgot to remove debug prints, fixing

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

14 years agoadd new SPR_OVERHEAD (ident 7), a derivative of SPR_VP_PARALLEL with couple of hacks...
vortex [Mon, 11 Jan 2010 20:17:06 +0000 (20:17 +0000)]
add new SPR_OVERHEAD (ident 7), a derivative of SPR_VP_PARALLEL with couple of hacks for better use with overhead-mode sprite monsters.

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

14 years agooptimized pose math to not use intermediate matrix
eihrul [Mon, 11 Jan 2010 17:29:19 +0000 (17:29 +0000)]
optimized pose math to not use intermediate matrix

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

14 years agofix model scaling on old zym and dpm files where the root bone was
havoc [Sat, 9 Jan 2010 20:47:13 +0000 (20:47 +0000)]
fix model scaling on old zym and dpm files where the root bone was
scaled

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

14 years agofix compile warning
havoc [Sat, 9 Jan 2010 19:09:19 +0000 (19:09 +0000)]
fix compile warning

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

14 years agoredesigned skeletal model animation bone pose format - instead of
havoc [Sat, 9 Jan 2010 08:41:34 +0000 (08:41 +0000)]
redesigned skeletal model animation bone pose format - instead of
float[12] matrix data it is now short[6] origin+quat data with
appropriate scale factors detected at load to preserve full range of
motion, this does however lose the ability to scale bones in a model...
this reduces memory usage significantly in some games

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

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

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

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

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

14 years agofix compile error
divverent [Sat, 9 Jan 2010 18:52:47 +0000 (18:52 +0000)]
fix compile error

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

14 years agosilence warning about using uninitialized pose var
eihrul [Sat, 9 Jan 2010 18:48:38 +0000 (18:48 +0000)]
silence warning about using uninitialized pose var

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

14 years ago.dir -> .pk3dir only
divverent [Sat, 9 Jan 2010 18:47:00 +0000 (18:47 +0000)]
.dir -> .pk3dir only

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

14 years agoalso support the .dir and .d extensions for virtual packs
divverent [Sat, 9 Jan 2010 18:46:56 +0000 (18:46 +0000)]
also support the .dir and .d extensions for virtual packs

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

14 years agofix vpack support to actually work; use a pack_s structure for vpack items
divverent [Sat, 9 Jan 2010 18:46:52 +0000 (18:46 +0000)]
fix vpack support to actually work; use a pack_s structure for vpack items

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

14 years agofix some compile errors. Now it should work.
divverent [Sat, 9 Jan 2010 18:46:49 +0000 (18:46 +0000)]
fix some compile errors. Now it should work.

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

14 years agofirst vpack stuff
divverent [Sat, 9 Jan 2010 18:46:43 +0000 (18:46 +0000)]
first vpack stuff

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

14 years agolog dds texture load failures (only happens with r_texture_dds_load 1)
havoc [Sat, 9 Jan 2010 08:38:20 +0000 (08:38 +0000)]
log dds texture load failures (only happens with r_texture_dds_load 1)

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

14 years agomore memory savings
havoc [Fri, 8 Jan 2010 08:53:30 +0000 (08:53 +0000)]
more memory savings

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

14 years agotexture management now uses a memexpandablearray_t instead of individual
havoc [Fri, 8 Jan 2010 08:52:59 +0000 (08:52 +0000)]
texture management now uses a memexpandablearray_t instead of individual
allocations

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