xonotic/darkplaces.git
7 years agoshowtex 1 xonotic-v0.5.0
divverent [Sat, 3 Sep 2011 20:13:16 +0000 (20:13 +0000)]
showtex 1

shows the texture on crosshair (only world and SOLID_BSP surfaces)

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

7 years agodisable offsetmapping where TEXF_ALPHA is not set and no height bias exists
divverent [Sat, 3 Sep 2011 15:06:21 +0000 (15:06 +0000)]
disable offsetmapping where TEXF_ALPHA is not set and no height bias exists

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

7 years agoadd -noconsole option to block console input and display
divverent [Fri, 2 Sep 2011 21:09:25 +0000 (21:09 +0000)]
add -noconsole option to block console input and display

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

7 years agoalso set TEXF_ALPHA on GL_ONE GL_ONE (don't ask)
divverent [Fri, 2 Sep 2011 20:24:31 +0000 (20:24 +0000)]
also set TEXF_ALPHA on GL_ONE GL_ONE (don't ask)

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

7 years agoenable offsetmapping permutations only if a normalmap exists and no bias is set
divverent [Fri, 2 Sep 2011 18:25:53 +0000 (18:25 +0000)]
enable offsetmapping permutations only if a normalmap exists and no bias is set

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

7 years agoset TEXF_ALPHA on shader stages only if necessary
divverent [Mon, 29 Aug 2011 20:20:38 +0000 (20:20 +0000)]
set TEXF_ALPHA on shader stages only if necessary

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

7 years agochange how offsetmapping bias works for less artifacts in offsetmapping mode
divverent [Thu, 1 Sep 2011 18:26:25 +0000 (18:26 +0000)]
change how offsetmapping bias works for less artifacts in offsetmapping mode

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

7 years agofix parameter number
divverent [Thu, 1 Sep 2011 07:49:18 +0000 (07:49 +0000)]
fix parameter number

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

7 years agochange to offsetmapping syntax:
divverent [Thu, 1 Sep 2011 07:09:19 +0000 (07:09 +0000)]
change to offsetmapping syntax:

dpoffsetmapping - SCALE bias BIASVALUE
dpoffsetmapping - SCALE match FLOAT_PIXEL_VALUE_THAT_IS_BASE_LEVEL
dpoffsetmapping - SCALE match8 8BIT_PIXEL_VALUE_THAT_IS_BASE_LEVEL
dpoffsetmapping - SCALE match16 16BIT_PIXEL_VALUE_THAT_IS_BASE_LEVEL

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

7 years agoon Unix, avoid actually creating config.cfg when testing gamedirs
divverent [Wed, 31 Aug 2011 05:42:35 +0000 (05:42 +0000)]
on Unix, avoid actually creating config.cfg when testing gamedirs

We can use access() with W_OK | X_OK on the directory instead there

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

7 years agofix a typo causing compile error
divverent [Tue, 30 Aug 2011 14:55:33 +0000 (14:55 +0000)]
fix a typo causing compile error

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

7 years agofix another data loss type conversion
divverent [Tue, 30 Aug 2011 13:14:55 +0000 (13:14 +0000)]
fix another data loss type conversion

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

7 years agooffsetbias: changed range to 0..1 to match what the shader does
divverent [Tue, 30 Aug 2011 12:10:35 +0000 (12:10 +0000)]
offsetbias: changed range to 0..1 to match what the shader does

(agreed to with LordHavoc)

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

7 years agomake offsetmapping bias actually work
divverent [Mon, 29 Aug 2011 20:23:09 +0000 (20:23 +0000)]
make offsetmapping bias actually work

(integer division -> float division)

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

7 years agoOffsetmapping: new "Bias" parameter that sets a custom "null point" instead of always...
vortex [Mon, 29 Aug 2011 19:35:03 +0000 (19:35 +0000)]
Offsetmapping: new "Bias" parameter that sets a custom "null point" instead of always having fixed one (at white), set as 0-255 byte additional "dpoffsetmapping" parm (dpoffsetmapping <technic> <scale> <bias>) a value of 128 makes offsetmapping centered at gray (no effect at gray, black is positive offset, white is negative). Additinally "dpoffsetmapping disabled" now parsed correctly. To see difference of offsetmapping bias see this shot (animated): omnicide.legacy-of-kain.ru/work/omnicide000137.gif

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

7 years agoadd missing uniform
eihrul [Wed, 24 Aug 2011 11:47:00 +0000 (11:47 +0000)]
add missing uniform

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

7 years agowho's inserting CRLFs all the time
divverent [Wed, 24 Aug 2011 09:02:05 +0000 (09:02 +0000)]
who's inserting CRLFs all the time

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

7 years agoExperimental r_glsl_offsetmapping_lod cvar which applies a distance-based correction...
vortex [Tue, 23 Aug 2011 22:13:07 +0000 (22:13 +0000)]
Experimental r_glsl_offsetmapping_lod cvar which applies a distance-based correction to number of offsetmapping steps, makes up to 40% fps boost on open area maps with lots of reliefmapped surfaces and no quality loss, gives about 5-10% on generic case (requires accurate tweaking for best results).

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

7 years agoimplement TEXF_FORCE_RELOAD to reload a pre-existing skinframe
divverent [Sat, 27 Aug 2011 19:00:18 +0000 (19:00 +0000)]
implement TEXF_FORCE_RELOAD to reload a pre-existing skinframe

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

7 years agofix cachepic handling with respect to r_restart and Draw_NewPic
divverent [Sat, 27 Aug 2011 18:52:13 +0000 (18:52 +0000)]
fix cachepic handling with respect to r_restart and Draw_NewPic

Some forgotten memsets, and attempts to free the notexture, could wreak havoc

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

7 years agoadd missing TEXF_ALPHA when loading the glossmap
divverent [Mon, 29 Aug 2011 19:23:31 +0000 (19:23 +0000)]
add missing TEXF_ALPHA when loading the glossmap

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

7 years agogloss: exact specular math has min gloss exponent 4, not 1
divverent [Mon, 29 Aug 2011 19:08:36 +0000 (19:08 +0000)]
gloss: exact specular math has min gloss exponent 4, not 1

this is because both yield to "internal exponent" 1, because exactspecularmath has to divide the exponent by 4 to look the same

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

7 years agomake sure another way it never calculates 0^0
divverent [Mon, 29 Aug 2011 15:23:33 +0000 (15:23 +0000)]
make sure another way it never calculates 0^0

we now avoid too-small exponents instead (alpha 0 now is exponent 1, not 0)

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

7 years agomake sure gloss never calculates 0^0
divverent [Mon, 29 Aug 2011 14:02:58 +0000 (14:02 +0000)]
make sure gloss never calculates 0^0

as that is undefined and leads to black stuff

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

7 years agofix bugs introduced by r11262
eihrul [Wed, 24 Aug 2011 12:52:15 +0000 (12:52 +0000)]
fix bugs introduced by r11262

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

7 years agothis file needs eol-style too...
divverent [Wed, 24 Aug 2011 12:32:01 +0000 (12:32 +0000)]
this file needs eol-style too...

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

7 years agoadd a script to automate svn:eol-style processing
divverent [Wed, 24 Aug 2011 12:31:22 +0000 (12:31 +0000)]
add a script to automate svn:eol-style processing

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

7 years agoset svn:eol-style properties on new files
divverent [Wed, 24 Aug 2011 12:31:09 +0000 (12:31 +0000)]
set svn:eol-style properties on new files

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

7 years agofix crashing due to alignment
eihrul [Wed, 24 Aug 2011 10:55:28 +0000 (10:55 +0000)]
fix crashing due to alignment

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

7 years agoALIGNED_SIZE -> ALIGN_SIZE
eihrul [Wed, 24 Aug 2011 10:51:39 +0000 (10:51 +0000)]
ALIGNED_SIZE -> ALIGN_SIZE

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

7 years agoonly need 4 byte alignment for atomicity
eihrul [Wed, 24 Aug 2011 10:49:14 +0000 (10:49 +0000)]
only need 4 byte alignment for atomicity

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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 qwfodquake.net

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

7 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

7 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

7 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

7 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)

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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