]> de.git.xonotic.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
12 years agobig oops: fix C++ compilation (had used "operator" as variable name)
divverent [Wed, 24 Aug 2011 08:49:36 +0000 (08:49 +0000)]
big oops: fix C++ compilation (had used "operator" as variable name)

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

12 years agofix gameversion logic :(
divverent [Tue, 23 Aug 2011 19:25:09 +0000 (19:25 +0000)]
fix gameversion logic :(

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

12 years agonew cvar: r_sortentities to sort render edicts.
divverent [Tue, 23 Aug 2011 13:59:15 +0000 (13:59 +0000)]
new cvar: r_sortentities to sort render edicts.

This is not as good as real surface batching across entities, but often about
equally good. Tends to gain about 1% on space maps or other "unvisable stuff".

Not active by default yet.

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

12 years agocvar: csqc_usedemoprogs
divverent [Sat, 20 Aug 2011 16:46:20 +0000 (16:46 +0000)]
cvar: csqc_usedemoprogs

allows to use the file system csprogs.dat for demo playback, mainly useful
for debugging csqc issues that happen when playing back a demo

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

12 years agodpshaderkill enhancements
divverent [Sat, 20 Aug 2011 15:41:23 +0000 (15:41 +0000)]
dpshaderkill enhancements

"Kill" current shader:
dpshaderkillifcvar r_foo == 42
dpshaderkillifcvar r_foo != 42
dpshaderkillifcvar r_foo < 42
dpshaderkillifcvar r_foo > 42
dpshaderkillifcvar r_foo <= 42
dpshaderkillifcvar r_foo >= 42

"Un-kill" current shader (unsets the kill flag):
dpnoshaderkillifcvar r_foo == 42
dpnoshaderkillifcvar r_foo != 42
dpnoshaderkillifcvar r_foo < 42
dpnoshaderkillifcvar r_foo > 42
dpnoshaderkillifcvar r_foo <= 42
dpnoshaderkillifcvar r_foo >= 42

Also, shader override logic is modified so killed shaders can be used to make
alternatives, e.g. switching between two shader definitions based on cvars:
- killed shaders never override other shaders, but show no warning
- non-killed shaders override killed shaders
- non-killed shaders still do not override other non-killed shaders

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

12 years agoadded dpshaderkillifcvar and dpshaderkillifcvarzero keywords for
havoc [Sat, 20 Aug 2011 13:29:21 +0000 (13:29 +0000)]
added dpshaderkillifcvar and dpshaderkillifcvarzero keywords for
shaders, their parameter is a custom cvar name of your choice

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

12 years agosys_usenoclockbutbenchmark: use double for the timer,
divverent [Thu, 18 Aug 2011 13:02:52 +0000 (13:02 +0000)]
sys_usenoclockbutbenchmark: use double for the timer,

to run for more than 1h:11m simulated time

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

12 years agobe more clear that the crypto_keys fingerprints are public
divverent [Thu, 18 Aug 2011 11:36:43 +0000 (11:36 +0000)]
be more clear that the crypto_keys fingerprints are public

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

12 years agouri_post: make content type mandatory
divverent [Wed, 17 Aug 2011 20:11:33 +0000 (20:11 +0000)]
uri_post: make content type mandatory

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

12 years agoallow extra args for messagemode and messagemode2 to prefill a message prefix
divverent [Wed, 17 Aug 2011 07:42:33 +0000 (07:42 +0000)]
allow extra args for messagemode and messagemode2 to prefill a message prefix

useful for quick team communication binds (e.g. putting "Get the flag," in the message, and using tab completion to fill in the name who should do it)

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

12 years agoMOVETYPE_FLY_WORLDONLY (movetype 33)
divverent [Tue, 16 Aug 2011 12:10:18 +0000 (12:10 +0000)]
MOVETYPE_FLY_WORLDONLY (movetype 33)

Can't explain here what it does, Captain Obvious would enjoy it too much.

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

12 years agoallow drawpic calls without flag parameter, as per CSQC spec
havoc [Tue, 16 Aug 2011 12:04:15 +0000 (12:04 +0000)]
allow drawpic calls without flag parameter, as per CSQC spec

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

12 years agoallow calls to drawstring without the flag parameter, as per CSQC spec
havoc [Tue, 16 Aug 2011 12:01:11 +0000 (12:01 +0000)]
allow calls to drawstring without the flag parameter, as per CSQC spec

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

12 years agoexpose R_SetView (aka setproperty) as builtin 309 as well (FTEQW's
havoc [Tue, 16 Aug 2011 11:56:43 +0000 (11:56 +0000)]
expose R_SetView (aka setproperty) as builtin 309 as well (FTEQW's
getproperty builtin), this should be compatible

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

12 years agofix MOVETYPE_FAKEPUSH (tenebrae movetype 13) implementation
havoc [Tue, 16 Aug 2011 11:34:12 +0000 (11:34 +0000)]
fix MOVETYPE_FAKEPUSH (tenebrae movetype 13) implementation

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

12 years agodon't draw bouncegrid on custom csqc scenes without drawworld
havoc [Tue, 16 Aug 2011 08:19:35 +0000 (08:19 +0000)]
don't draw bouncegrid on custom csqc scenes without drawworld

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

12 years agofix GLSL shader error with directional bouncegrid and fog
havoc [Tue, 16 Aug 2011 08:06:52 +0000 (08:06 +0000)]
fix GLSL shader error with directional bouncegrid and fog

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

12 years agofix a wrong variable name
divverent [Sun, 14 Aug 2011 18:40:27 +0000 (18:40 +0000)]
fix a wrong variable name

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

12 years agofix support of odd heights in YUV conversion for video capture
divverent [Sun, 14 Aug 2011 14:50:49 +0000 (14:50 +0000)]
fix support of odd heights in YUV conversion for video capture

(prevents a memory corruption there)

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

12 years agoadded cast_half, cast_half2, cast_half3, cast_half4 macros to avoid
havoc [Sun, 7 Aug 2011 17:59:14 +0000 (17:59 +0000)]
added cast_half, cast_half2, cast_half3, cast_half4 macros to avoid
errors on the use of mediump when doing casts on GLES2

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

12 years agofix typos
havoc [Fri, 5 Aug 2011 21:19:06 +0000 (21:19 +0000)]
fix typos

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

12 years agodon't depend on ptrdiff_t
havoc [Fri, 5 Aug 2011 21:13:08 +0000 (21:13 +0000)]
don't depend on ptrdiff_t

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

12 years agowe probably don't need to call SDL_GL_LoadLibrary on Maemo...
havoc [Fri, 5 Aug 2011 16:56:43 +0000 (16:56 +0000)]
we probably don't need to call SDL_GL_LoadLibrary on Maemo...

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

12 years agofix a couple compile issues affecting Maemo
havoc [Fri, 5 Aug 2011 16:52:37 +0000 (16:52 +0000)]
fix a couple compile issues affecting Maemo

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

12 years agofix a pile of issues with calling conventions on GLES2 platforms by
havoc [Wed, 3 Aug 2011 20:57:40 +0000 (20:57 +0000)]
fix a pile of issues with calling conventions on GLES2 platforms by
directly calling the gl functions on these platforms, this required
quite an overhaul in the headers and a lot of code gets disabled if
USE_GLES2 to avoid referencing undefined constants and such...

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

12 years agofix an obvious crash in user controlled wave func handling
divverent [Wed, 3 Aug 2011 13:34:47 +0000 (13:34 +0000)]
fix an obvious crash in user controlled wave func handling

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

12 years agofix line feeds
divverent [Tue, 2 Aug 2011 18:58:58 +0000 (18:58 +0000)]
fix line feeds

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

12 years agoadd a helper function to release all keys "properly"
divverent [Tue, 2 Aug 2011 18:58:57 +0000 (18:58 +0000)]
add a helper function to release all keys "properly"

(not used yet)

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

12 years agor_glsl_deluxemapping 2 support for vertexlit surfaces, deluxemap forced surfaces...
vortex [Sun, 31 Jul 2011 21:54:13 +0000 (21:54 +0000)]
r_glsl_deluxemapping 2 support for vertexlit surfaces, deluxemap forced surfaces no longer use texture2d(deluxemap). Attempt to fix '2D pics GLSL gamma with sRGB', added v_glslgamma_2d (default 0). New "dprtlightambient" shader keyword which adds ambient rtlight to surface, useful on lowpoly harsh entities (like grass bushes) for smoother rtlightning. New trick: CSQC sound/pointsound plugins take "#sound_index" which can be returned by precache_sound.

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

12 years agoLightmaps merging debug print ("copying original lightmap") now uses dprint. ODE...
vortex [Sun, 31 Jul 2011 03:47:41 +0000 (03:47 +0000)]
Lightmaps merging debug print ("copying original lightmap") now uses dprint. ODE: Add SOLID_PHYSICS_TRIMESH to replace SOLID_BSP as it has some bad hacks applied (like unstuck code). Added cvar physics_ode_world_gravitymod.

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

12 years agoremoving more memcpys from IQM loading
eihrul [Fri, 29 Jul 2011 13:22:43 +0000 (13:22 +0000)]
removing more memcpys from IQM loading

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

12 years agoIQM loading fixes and optimizations
eihrul [Fri, 29 Jul 2011 13:20:20 +0000 (13:20 +0000)]
IQM loading fixes and optimizations

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

12 years agore-optimize the IQM model loader somewhat by not allocating and copying
havoc [Fri, 29 Jul 2011 12:42:24 +0000 (12:42 +0000)]
re-optimize the IQM model loader somewhat by not allocating and copying
any data that is read-only in nature (the endian functions are
unaligned-safe by nature)

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

12 years agoreworked iqm model loader to copy all data into allocated memory blocks
havoc [Fri, 29 Jul 2011 09:38:36 +0000 (09:38 +0000)]
reworked iqm model loader to copy all data into allocated memory blocks
at load to prevent misaligned memory crashes on Sparc, PowerPC, others

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

12 years agoQuick fix on COM_ToLowerString/COM_ToUpperString to let them work right on null UTF8...
vortex [Thu, 28 Jul 2011 10:20:57 +0000 (10:20 +0000)]
Quick fix on COM_ToLowerString/COM_ToUpperString to let them work right on null UTF8 strings.

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

12 years agoFix savegame loading crash
vortex [Wed, 27 Jul 2011 20:30:34 +0000 (20:30 +0000)]
Fix savegame loading crash

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

12 years agodisable VorteX's gamma corrected 2D drawing because it is broken with
havoc [Mon, 25 Jul 2011 00:17:54 +0000 (00:17 +0000)]
disable VorteX's gamma corrected 2D drawing because it is broken with
vid_sRGB 1, the patch needs more work before it will be used

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

12 years agoFix gl_texturecompression_sprites to check for gl_texturecompression. Rough patch...
vortex [Sun, 24 Jul 2011 12:34:21 +0000 (12:34 +0000)]
Fix gl_texturecompression_sprites to check for gl_texturecompression. Rough patch to make v_glslgamma work with 2d graphics (hud, menupics, video etc.).

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

12 years agoSV_PushMove: no longer assume that just rotating the origin is correct
divverent [Wed, 27 Jul 2011 14:14:56 +0000 (14:14 +0000)]
SV_PushMove: no longer assume that just rotating the origin is correct

instead, do some nudge-out-of-solid like handling of the error

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

12 years agoadded sv_namechangetimer cvar which allows the name change frequency to
havoc [Sat, 23 Jul 2011 06:08:50 +0000 (06:08 +0000)]
added sv_namechangetimer cvar which allows the name change frequency to
be changed from the default 5 seconds

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

12 years agoremove a redundant (and bugged) check
havoc [Thu, 21 Jul 2011 22:08:22 +0000 (22:08 +0000)]
remove a redundant (and bugged) check

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

12 years agofix two errors in DDS format as written by DP
divverent [Sat, 16 Jul 2011 18:54:18 +0000 (18:54 +0000)]
fix two errors in DDS format as written by DP

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

12 years agoadded a FIXME comment - R_CompleteLightPoint should count bouncegrid
havoc [Wed, 13 Jul 2011 16:37:38 +0000 (16:37 +0000)]
added a FIXME comment - R_CompleteLightPoint should count bouncegrid

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

12 years agohandle IQM models with no blend weights
eihrul [Mon, 11 Jul 2011 09:17:39 +0000 (09:17 +0000)]
handle IQM models with no blend weights

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

12 years agotab formatting fix
eihrul [Sun, 10 Jul 2011 19:14:37 +0000 (19:14 +0000)]
tab formatting fix

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

12 years agobuild static frame for IQM models with no animations
eihrul [Sun, 10 Jul 2011 19:10:32 +0000 (19:10 +0000)]
build static frame for IQM models with no animations

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

12 years agoadded -developer3 for crazy debugging sessions (gl_printcheckerror spew)
havoc [Sat, 9 Jul 2011 20:27:07 +0000 (20:27 +0000)]
added -developer3 for crazy debugging sessions (gl_printcheckerror spew)

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

12 years agoprint shader compile and link logs always if developer_extra 1 (you get
havoc [Sat, 9 Jul 2011 20:25:49 +0000 (20:25 +0000)]
print shader compile and link logs always if developer_extra 1 (you get
this with -developer2 on the commandline)

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

12 years agoUpdate the default values for the motionblur..... I think this is basically done...
divverent [Sat, 9 Jul 2011 14:08:53 +0000 (14:08 +0000)]
Update the default values for the motionblur..... I think this is basically done at this point.

From: Samual <samual@xonotic.org>

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

12 years agoAdd/update cvars and such... Almost done now basically. Just a bit of testing left.
divverent [Sat, 9 Jul 2011 14:08:49 +0000 (14:08 +0000)]
Add/update cvars and such... Almost done now basically. Just a bit of testing left.

From: Samual <samual@xonotic.org>

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

12 years agoChange how the factor is calculated and set it up to be finished
divverent [Sat, 9 Jul 2011 14:08:45 +0000 (14:08 +0000)]
Change how the factor is calculated and set it up to be finished

From: Samual <samual@xonotic.org>

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

12 years agoBegin a quick re-write of how motionblur values are calculated
divverent [Sat, 9 Jul 2011 14:08:41 +0000 (14:08 +0000)]
Begin a quick re-write of how motionblur values are calculated

From: Samual <samual@xonotic.org>

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

12 years agoDifferent fade rates for adapting to bright scenes and adapting to dark scenes
divverent [Sat, 9 Jul 2011 13:56:23 +0000 (13:56 +0000)]
Different fade rates for adapting to bright scenes and adapting to dark scenes

From: Samual <samual@xonotic.org>

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

12 years agochanged qwmasters - kubus.rulez.pl is down, added qwmaster.fodquake.net
havoc [Sat, 9 Jul 2011 07:35:47 +0000 (07:35 +0000)]
changed qwmasters - kubus.rulez.pl is down, added qwmaster.fodquake.net

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

12 years agoMerge branch 'div0-stable' of git://git.xonotic.org/xonotic/darkplaces into div0...
Rudolf Polzer [Sat, 23 Jul 2011 08:19:39 +0000 (10:19 +0200)]
Merge branch 'div0-stable' of git://git.xonotic.org/xonotic/darkplaces into div0-stable

12 years agofix gl_mesh_testmanualfeeding
divverent [Fri, 8 Jul 2011 19:33:54 +0000 (19:33 +0000)]
fix gl_mesh_testmanualfeeding

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

12 years agoOS X compile: do not build the AGL target by default (use make cl-release to build...
divverent [Fri, 8 Jul 2011 08:27:05 +0000 (08:27 +0000)]
OS X compile: do not build the AGL target by default (use make cl-release to build it anyway)

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

12 years agoOS X compile: do not build the AGL target by default (use make cl-release to build...
Rudolf Polzer [Fri, 8 Jul 2011 08:25:07 +0000 (10:25 +0200)]
OS X compile: do not build the AGL target by default (use make cl-release to build it anyway)

12 years agoDP_SND_SOUND7_WIP1
divverent [Tue, 5 Jul 2011 19:48:04 +0000 (19:48 +0000)]
DP_SND_SOUND7_WIP1

sound7() function, supporting more sound channels (-128 to 127, negative ones being additional auto-channels, positive ones being additional single-channels)

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

12 years agomove gecko builtins to menudefs.qc
divverent [Sat, 2 Jul 2011 15:23:35 +0000 (15:23 +0000)]
move gecko builtins to menudefs.qc

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

12 years agoeffectinfo velocitymultiplier defaults to 0 again
havoc [Fri, 1 Jul 2011 05:42:57 +0000 (05:42 +0000)]
effectinfo velocitymultiplier defaults to 0 again

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

12 years agofix default effectinfo gravity and size
havoc [Fri, 1 Jul 2011 05:40:29 +0000 (05:40 +0000)]
fix default effectinfo gravity and size

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

12 years agodefault effectinfo velocitymultiplier to 0 in nexuiz mode
havoc [Fri, 1 Jul 2011 05:25:04 +0000 (05:25 +0000)]
default effectinfo velocitymultiplier to 0 in nexuiz mode

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

12 years agofix some loading errors on effectinfo.txt where variables were not being
havoc [Thu, 30 Jun 2011 04:55:23 +0000 (04:55 +0000)]
fix some loading errors on effectinfo.txt where variables were not being
cleared properly
changed default effectinfo velocitymultiplier from 0 to 1

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

12 years agofix offsetmapping without a q3 shader on Q1BSP and MDL
havoc [Tue, 28 Jun 2011 08:12:15 +0000 (08:12 +0000)]
fix offsetmapping without a q3 shader on Q1BSP and MDL

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

12 years agodon't spam joy_active notices with developer_extra
havoc [Tue, 28 Jun 2011 00:55:10 +0000 (00:55 +0000)]
don't spam joy_active notices with developer_extra

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

12 years agoprevent segfault caused by stringlistsort
divverent [Mon, 27 Jun 2011 14:05:26 +0000 (14:05 +0000)]
prevent segfault caused by stringlistsort

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

12 years agofix C++ compile errors
havoc [Mon, 27 Jun 2011 02:20:27 +0000 (02:20 +0000)]
fix C++ compile errors

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

12 years agofix the solid water bug for real
havoc [Mon, 27 Jun 2011 02:15:09 +0000 (02:15 +0000)]
fix the solid water bug for real

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

12 years agoanother attempt at fixing solid water in the dedicated server
havoc [Mon, 27 Jun 2011 02:10:35 +0000 (02:10 +0000)]
another attempt at fixing solid water in the dedicated server

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

12 years agoimplemented DP_ENT_TRAILEFFECTNUM extension, which allows
havoc [Sun, 26 Jun 2011 22:37:13 +0000 (22:37 +0000)]
implemented DP_ENT_TRAILEFFECTNUM extension, which allows
self.traileffectnum = particleeffectnum("mycustomeffect") on server
entities, rather than requiring csqc for trailparticles()

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

12 years agofix a bug in EntityFrame5 stats delta bits handling
divverent [Sun, 26 Jun 2011 19:50:50 +0000 (19:50 +0000)]
fix a bug in EntityFrame5 stats delta bits handling

It forgot to memset the stats delta bits to 0, so it marked stats as being sent
in the database that were not. This clearly caused too large resend data when
packet loss occurred.

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

12 years agofunny feature: cl_lerpexcess
divverent [Sun, 26 Jun 2011 19:07:03 +0000 (19:07 +0000)]
funny feature: cl_lerpexcess

Hides the effect of packet loss for linear motion. Mispredicts nonlinear
motion, of course. Can be configured to a max number of server packets lost
that it will try to compensate for. Of course off by default.

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

12 years agoadd a workaround to make the ^ key work on some X.org systems
divverent [Sun, 26 Jun 2011 09:09:15 +0000 (09:09 +0000)]
add a workaround to make the ^ key work on some X.org systems

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

12 years agowork around broken XLookupKeysym returning "" on XK_asciicircum
divverent [Sun, 26 Jun 2011 09:09:13 +0000 (09:09 +0000)]
work around broken XLookupKeysym returning "" on XK_asciicircum

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

12 years agocleaned up the fix for solid water in q1bsp dedicated servers
havoc [Sun, 26 Jun 2011 04:52:15 +0000 (04:52 +0000)]
cleaned up the fix for solid water in q1bsp dedicated servers

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

12 years agofix q1bsp dedicated server collisions, a simplification of the q1bsp
havoc [Sun, 26 Jun 2011 04:50:41 +0000 (04:50 +0000)]
fix q1bsp dedicated server collisions, a simplification of the q1bsp
loading code was breaking the material information and thus water was
made solid

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

12 years agofixed gfx/menuplyr handling - Draw_NewPic now flags the cachepic_t with
havoc [Fri, 24 Jun 2011 01:38:21 +0000 (01:38 +0000)]
fixed gfx/menuplyr handling - Draw_NewPic now flags the cachepic_t with
CACHEPICFLAG_NEWPIC which disables texflags comparisons

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

12 years agodraw weapons on sbar at full opacity like they are in mission packs
havoc [Thu, 23 Jun 2011 07:21:55 +0000 (07:21 +0000)]
draw weapons on sbar at full opacity like they are in mission packs

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

12 years agofix model loading memory corruption errors related to
havoc [Thu, 23 Jun 2011 05:41:53 +0000 (05:41 +0000)]
fix model loading memory corruption errors related to
r_enableshadowvolumes 0, and also potential memory corruption errors
related to numvertices <= 65536

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

12 years agomore rework of r_shadow_bouncegrid, now dynamic mode performs somewhat
havoc [Thu, 23 Jun 2011 03:12:27 +0000 (03:12 +0000)]
more rework of r_shadow_bouncegrid, now dynamic mode performs somewhat
better, but still without the artifacts it used to have
added more static mode cvars to differentiate optimal settings

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

12 years agoadded r_shadow_bouncegrid 2 which disables rtlights and just renders the
havoc [Thu, 23 Jun 2011 02:44:24 +0000 (02:44 +0000)]
added r_shadow_bouncegrid 2 which disables rtlights and just renders the
bouncegrid
reworked several aspects of bouncegrid, it has less grid artifacts now

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

12 years agoadded sv_gameplayfix_q1bsptracelinereportstexture cvar (default 1), to
havoc [Wed, 22 Jun 2011 20:13:42 +0000 (20:13 +0000)]
added sv_gameplayfix_q1bsptracelinereportstexture cvar (default 1), to
allow people to disable the surface-based traceline if they so desire

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

12 years ago"real" Unicode upper/lowercase (only 1:1 mappings, though)
divverent [Tue, 21 Jun 2011 20:33:09 +0000 (20:33 +0000)]
"real" Unicode upper/lowercase (only 1:1 mappings, though)

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

12 years agofix two typos in DP_PHYSICS_ODE explanation (thanks FrikaC for pointing
havoc [Mon, 20 Jun 2011 05:29:39 +0000 (05:29 +0000)]
fix two typos in DP_PHYSICS_ODE explanation (thanks FrikaC for pointing
these out)
synchronize dpextensions.qc files (for anyone reading the dpmod one)

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

12 years agochange default r_texture_dds_load_logfailure to 0 as was intended
havoc [Sun, 19 Jun 2011 19:40:06 +0000 (19:40 +0000)]
change default r_texture_dds_load_logfailure to 0 as was intended

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

12 years agofix entity networking AGAIN
divverent [Tue, 14 Jun 2011 18:55:08 +0000 (18:55 +0000)]
fix entity networking AGAIN

Do NOT inhibit sending EntityState5 removes for CSQC entities!
These entities may be needed for state changes.

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

12 years agofix wrong array sizes in MODE_WATER in softrast causing an overrun
divverent [Mon, 13 Jun 2011 18:34:50 +0000 (18:34 +0000)]
fix wrong array sizes in MODE_WATER in softrast causing an overrun

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

12 years agofix some warnings about useless code (unsigned < 0, x = x)
divverent [Mon, 13 Jun 2011 18:34:46 +0000 (18:34 +0000)]
fix some warnings about useless code (unsigned < 0, x = x)

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

12 years agofix detection of multisampling for ATC
divverent [Mon, 13 Jun 2011 18:28:06 +0000 (18:28 +0000)]
fix detection of multisampling for ATC

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

12 years agorefactored MSG_ReadString to be nicer code (and fix a potentially uninitialized varia...
havoc [Mon, 13 Jun 2011 17:31:58 +0000 (17:31 +0000)]
refactored MSG_ReadString to be nicer code (and fix a potentially uninitialized variable warning)

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

12 years agoMSG_ReadString: if hitting the max length of the string, continue to read until NUL...
divverent [Mon, 13 Jun 2011 07:10:08 +0000 (07:10 +0000)]
MSG_ReadString: if hitting the max length of the string, continue to read until NUL anyway (prevents msg_badread when reading an overlong string)

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

12 years agomake "exec" accept wildcards
divverent [Sun, 12 Jun 2011 19:59:24 +0000 (19:59 +0000)]
make "exec" accept wildcards

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

12 years agoremove duplicate names from file search results
divverent [Sun, 12 Jun 2011 19:59:21 +0000 (19:59 +0000)]
remove duplicate names from file search results

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

12 years agofix a crash on saving a game
havoc [Wed, 8 Jun 2011 20:32:11 +0000 (20:32 +0000)]
fix a crash on saving a game

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

12 years agoreworked progs loading so that entvars_t and globalvars_t are no longer
havoc [Wed, 8 Jun 2011 19:23:52 +0000 (19:23 +0000)]
reworked progs loading so that entvars_t and globalvars_t are no longer
required to match (if they do match, the relevant fields will match the
structs, otherwise name lookups are used), this means the PROGHEADER_CRC
no longer has to match either...  and same for csqc and menuqc

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

12 years agouse subtractive blend equation to support negative v_brightness; support smaller...
divverent [Wed, 8 Jun 2011 19:35:54 +0000 (19:35 +0000)]
use subtractive blend equation to support negative v_brightness; support smaller-than-1 contrast

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

12 years agoeliminated S_LockSfx and S_UnlockSfx which were not thread-safe and
havoc [Wed, 8 Jun 2011 18:03:19 +0000 (18:03 +0000)]
eliminated S_LockSfx and S_UnlockSfx which were not thread-safe and
could cause sounds to leak across multiple levels, cd play/loop now
immediately unload previous music track

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

12 years agoimplemented r_transparent_alphatocoverage 2 which promotes alphablend if
havoc [Wed, 8 Jun 2011 17:36:16 +0000 (17:36 +0000)]
implemented r_transparent_alphatocoverage 2 which promotes alphablend if
desired to ATC, the default is 1 (only promotes alphatest)
enable GL_MULTISAMPLE during extension detection to make things work

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

12 years agoreworked use of alphatest - now only GL11/GL13/GLES1 paths use it, other
havoc [Wed, 8 Jun 2011 13:33:46 +0000 (13:33 +0000)]
reworked use of alphatest - now only GL11/GL13/GLES1 paths use it, other
paths use SHADERPERMUTATION_ALPHAKILL (including the SOFT path)
reworked r_transparent_alphatocoverage, it no longer needs
vid_multisampling

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