]> de.git.xonotic.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
13 years agoreworked makefile a little bit to support DX9 renderer, add D3D=1 to
havoc [Thu, 19 Aug 2010 14:33:10 +0000 (14:33 +0000)]
reworked makefile a little bit to support DX9 renderer, add D3D=1 to
your make line to use it
now WIN32RELEASE and WIN64RELEASE do something useful (correct options
for 32bit and 64bit compiles)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10400 d7cf8633-e32d-0410-b094-e92efae38249

13 years agocheck the proper texture compression extension for deciding whether to S3TC compress
divverent [Thu, 19 Aug 2010 12:28:30 +0000 (12:28 +0000)]
check the proper texture compression extension for deciding whether to S3TC compress

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10399 d7cf8633-e32d-0410-b094-e92efae38249

13 years agocs_*project: as both 2D and 3D rendering are confined to the viewport, it SHOULD...
divverent [Thu, 19 Aug 2010 07:31:49 +0000 (07:31 +0000)]
cs_*project: as both 2D and 3D rendering are confined to the viewport, it SHOULD be right to totally ignore the viewport in these functions. I may be wrong here though.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10398 d7cf8633-e32d-0410-b094-e92efae38249

13 years agorecalc the 2D view if changing view parameters with R_SetView
divverent [Thu, 19 Aug 2010 07:21:30 +0000 (07:21 +0000)]
recalc the 2D view if changing view parameters with R_SetView

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10397 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoDraw_CachePic_Flags: ignore TEXF_COMPRESS when comparing, because fallback pics remov...
divverent [Thu, 19 Aug 2010 05:35:16 +0000 (05:35 +0000)]
Draw_CachePic_Flags: ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10396 d7cf8633-e32d-0410-b094-e92efae38249

13 years agouse cl.movevars_stepheight for stair smoothing
divverent [Thu, 19 Aug 2010 05:35:13 +0000 (05:35 +0000)]
use cl.movevars_stepheight for stair smoothing

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10395 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoIn the apropos command exclude \n from being filtered by wildcards for alias values...
divverent [Fri, 13 Aug 2010 18:42:44 +0000 (18:42 +0000)]
In the apropos command exclude \n from being filtered by wildcards for alias values (an alias value always got a final \n).
For example, apropos ? returned a bunch of aliases with empty definitions

From: terencehill <piuntn@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10390 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoGet rid of an unused variable
divverent [Fri, 13 Aug 2010 18:42:41 +0000 (18:42 +0000)]
Get rid of an unused variable

From: terencehill <piuntn@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10389 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFix issues with matchpattern_with_separator
divverent [Fri, 13 Aug 2010 18:42:38 +0000 (18:42 +0000)]
Fix issues with matchpattern_with_separator
Wrong results in case wildcard_least_one is:
- false: *rc*.cfg finds quake.rc
- true: quake.*rc finds quake.rc

From: terencehill <piuntn@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10388 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a warning
havoc [Thu, 12 Aug 2010 12:00:54 +0000 (12:00 +0000)]
fix a warning

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10387 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoset registered cvar consistently regardless of game mode
havoc [Thu, 12 Aug 2010 06:27:17 +0000 (06:27 +0000)]
set registered cvar consistently regardless of game mode

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10386 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix crash in steelstorm on a ent with no model
havoc [Thu, 12 Aug 2010 03:45:36 +0000 (03:45 +0000)]
fix crash in steelstorm on a ent with no model

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

13 years agofix crash in steelstorm on a ent with no model
havoc [Thu, 12 Aug 2010 03:45:36 +0000 (03:45 +0000)]
fix crash in steelstorm on a ent with no model

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10385 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoimproved include order to fix some compile errors using mingw g++
havoc [Mon, 9 Aug 2010 17:35:36 +0000 (17:35 +0000)]
improved include order to fix some compile errors using mingw g++

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

13 years agofix a C++ void pointer error
havoc [Mon, 9 Aug 2010 17:29:15 +0000 (17:29 +0000)]
fix a C++ void pointer error

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

13 years agoWin64 builds: search for DLLs in bin64/
divverent [Mon, 9 Aug 2010 13:27:54 +0000 (13:27 +0000)]
Win64 builds: search for DLLs in bin64/

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

13 years agoVM tokenizer: remove a duplicate condition in a long &&-expression
divverent [Mon, 9 Aug 2010 13:03:41 +0000 (13:03 +0000)]
VM tokenizer: remove a duplicate condition in a long &&-expression

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

13 years agoactually look into DXT1 pixel data to check if it has a 3 in base 4, to check if...
divverent [Mon, 9 Aug 2010 06:59:50 +0000 (06:59 +0000)]
actually look into DXT1 pixel data to check if it has a 3 in base 4, to check if the transparent pixel value is REALLY used; also enable alpha autodetection again

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

13 years agoMod_BuildAliasSkinsFromSkinFile: strip image extension
divverent [Mon, 9 Aug 2010 06:40:45 +0000 (06:40 +0000)]
Mod_BuildAliasSkinsFromSkinFile: strip image extension

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

13 years agofix a seldom sound related segfault
divverent [Fri, 6 Aug 2010 20:41:56 +0000 (20:41 +0000)]
fix a seldom sound related segfault

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

13 years agouse the DDPF_ALPHAPIXELS flag for DDS reading, at least works for ATI Compressonator
divverent [Fri, 6 Aug 2010 19:22:21 +0000 (19:22 +0000)]
use the DDPF_ALPHAPIXELS flag for DDS reading, at least works for ATI Compressonator

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

13 years agoimproved include order to fix some compile errors using mingw g++
havoc [Mon, 9 Aug 2010 17:35:36 +0000 (17:35 +0000)]
improved include order to fix some compile errors using mingw g++

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10384 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a few warnings
havoc [Mon, 9 Aug 2010 17:32:26 +0000 (17:32 +0000)]
fix a few warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10383 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a C++ void pointer error
havoc [Mon, 9 Aug 2010 17:29:15 +0000 (17:29 +0000)]
fix a C++ void pointer error

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10382 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoWin64 builds: search for DLLs in bin64/
divverent [Mon, 9 Aug 2010 13:27:54 +0000 (13:27 +0000)]
Win64 builds: search for DLLs in bin64/

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10381 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoVM tokenizer: remove a duplicate condition in a long &&-expression
divverent [Mon, 9 Aug 2010 13:03:41 +0000 (13:03 +0000)]
VM tokenizer: remove a duplicate condition in a long &&-expression

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10380 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoactually look into DXT1 pixel data to check if it has a 3 in base 4, to check if...
divverent [Mon, 9 Aug 2010 06:59:50 +0000 (06:59 +0000)]
actually look into DXT1 pixel data to check if it has a 3 in base 4, to check if the transparent pixel value is REALLY used; also enable alpha autodetection again

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10379 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoMod_BuildAliasSkinsFromSkinFile: strip image extension
divverent [Mon, 9 Aug 2010 06:40:45 +0000 (06:40 +0000)]
Mod_BuildAliasSkinsFromSkinFile: strip image extension

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10378 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a seldom sound related segfault
divverent [Fri, 6 Aug 2010 20:41:56 +0000 (20:41 +0000)]
fix a seldom sound related segfault

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10377 d7cf8633-e32d-0410-b094-e92efae38249

13 years agouse the DDPF_ALPHAPIXELS flag for DDS reading, at least works for ATI Compressonator
divverent [Fri, 6 Aug 2010 19:22:21 +0000 (19:22 +0000)]
use the DDPF_ALPHAPIXELS flag for DDS reading, at least works for ATI Compressonator

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10376 d7cf8633-e32d-0410-b094-e92efae38249

13 years agocvar: r_texture_dds_load_dxt1_noalpha; if set, DXT1 alpha detection is disabled,...
divverent [Fri, 6 Aug 2010 18:48:30 +0000 (18:48 +0000)]
cvar: r_texture_dds_load_dxt1_noalpha; if set, DXT1 alpha detection is disabled, and DXT1 is assumed to have no alpha.
Rationale is that ATI Compressonator sometimes picks the alpha'd compression mode [a, (a+b)/2, b, transparent] and then never uses the transparent color value 3, as it sometimes can yield better results than the non-alpha'd compression mode [a, (2a+b)/3, (a+2b)/3, b], and this throws off alpha detection on loading

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10375 d7cf8633-e32d-0410-b094-e92efae38249

13 years agocvar: r_texture_dds_load_dxt1_noalpha; if set, DXT1 alpha detection is disabled,...
divverent [Fri, 6 Aug 2010 18:48:30 +0000 (18:48 +0000)]
cvar: r_texture_dds_load_dxt1_noalpha; if set, DXT1 alpha detection is disabled, and DXT1 is assumed to have no alpha.
Rationale is that ATI Compressonator sometimes picks the alpha'd compression mode [a, (a+b)/2, b, transparent] and then never uses the transparent color value 3, as it sometimes can yield better results than the non-alpha'd compression mode [a, (2a+b)/3, (a+2b)/3, b], and this throws off alpha detection on loading

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

13 years agomake sure the return value of R_PicmipForFlags can't get negative
divverent [Fri, 6 Aug 2010 17:57:09 +0000 (17:57 +0000)]
make sure the return value of R_PicmipForFlags can't get negative

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10374 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake sure the return value of R_PicmipForFlags can't get negative
divverent [Fri, 6 Aug 2010 17:57:09 +0000 (17:57 +0000)]
make sure the return value of R_PicmipForFlags can't get negative

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

13 years agoonly send prydoncursor related buttons, if cl_prydoncursor is 1
divverent [Wed, 4 Aug 2010 16:33:55 +0000 (16:33 +0000)]
only send prydoncursor related buttons, if cl_prydoncursor is 1

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

13 years agoonly send prydoncursor related buttons, if cl_prydoncursor is 1
divverent [Wed, 4 Aug 2010 16:33:55 +0000 (16:33 +0000)]
only send prydoncursor related buttons, if cl_prydoncursor is 1

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10373 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoMerge remote branch 'origin/divVerent/clevercolormod'
Rudolf Polzer [Tue, 3 Aug 2010 19:58:10 +0000 (21:58 +0200)]
Merge remote branch 'origin/divVerent/clevercolormod'

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10372 d7cf8633-e32d-0410-b094-e92efae38249

::stable-branch::merge=1bbdccd9f5abb88f0a91e58d0d68a3a7094d28cd

13 years agoa different fix for colormod on unusual blendfuncs than the last one
havoc [Fri, 30 Jul 2010 06:22:01 +0000 (06:22 +0000)]
a different fix for colormod on unusual blendfuncs than the last one
(unusual being anything other than add or alpha)

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

13 years agodon't apply colormod to shaders that use unusual custom blendfuncs
havoc [Fri, 30 Jul 2010 05:26:39 +0000 (05:26 +0000)]
don't apply colormod to shaders that use unusual custom blendfuncs

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

13 years agoMerge remote branch 'origin/divVerent/clevercolormod'
divverent [Tue, 3 Aug 2010 19:55:56 +0000 (19:55 +0000)]
Merge remote branch 'origin/divVerent/clevercolormod'

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10372 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoalso allow 32768x32768 pcx files
havoc [Tue, 3 Aug 2010 05:54:37 +0000 (05:54 +0000)]
also allow 32768x32768 pcx files

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

13 years agoallow tga, wal and jpg images to be 32768x32768 rather than 4096x4096,
havoc [Tue, 3 Aug 2010 05:53:49 +0000 (05:53 +0000)]
allow tga, wal and jpg images to be 32768x32768 rather than 4096x4096,
fixes minimap creation in steelstorm at 8064x1600 resolution

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

13 years agouse TE_EXPLOSION in effectinfo.txt when encountering svc_particle with
havoc [Wed, 28 Jul 2010 20:12:11 +0000 (20:12 +0000)]
use TE_EXPLOSION in effectinfo.txt when encountering svc_particle with
count 1024 (exploboxes) rather than calling the internal
CL_ParticleExplosion directly, this allows people to override the effect

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

13 years agobump modplug version to libmodplug-1.dll (only supports 0.8.8 upwards, sorry, but...
divverent [Mon, 26 Jul 2010 12:05:38 +0000 (12:05 +0000)]
bump modplug version to libmodplug-1.dll (only supports 0.8.8 upwards, sorry, but any versions before are broken on 64bit platforms anyway)

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

13 years agoalso allow 32768x32768 pcx files
havoc [Tue, 3 Aug 2010 05:54:37 +0000 (05:54 +0000)]
also allow 32768x32768 pcx files

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10371 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoallow tga, wal and jpg images to be 32768x32768 rather than 4096x4096,
havoc [Tue, 3 Aug 2010 05:53:49 +0000 (05:53 +0000)]
allow tga, wal and jpg images to be 32768x32768 rather than 4096x4096,
fixes minimap creation in steelstorm at 8064x1600 resolution

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10370 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoa different fix for colormod on unusual blendfuncs than the last one
havoc [Fri, 30 Jul 2010 06:22:01 +0000 (06:22 +0000)]
a different fix for colormod on unusual blendfuncs than the last one
(unusual being anything other than add or alpha)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10369 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodon't apply colormod to shaders that use unusual custom blendfuncs
havoc [Fri, 30 Jul 2010 05:26:39 +0000 (05:26 +0000)]
don't apply colormod to shaders that use unusual custom blendfuncs

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10368 d7cf8633-e32d-0410-b094-e92efae38249

13 years agouse TE_EXPLOSION in effectinfo.txt when encountering svc_particle with
havoc [Wed, 28 Jul 2010 20:12:11 +0000 (20:12 +0000)]
use TE_EXPLOSION in effectinfo.txt when encountering svc_particle with
count 1024 (exploboxes) rather than calling the internal
CL_ParticleExplosion directly, this allows people to override the effect

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10367 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoLibrary loading: if a DLL succeeds to load but a function is missing, also continue...
divverent [Tue, 27 Jul 2010 19:22:30 +0000 (19:22 +0000)]
Library loading: if a DLL succeeds to load but a function is missing, also continue to the next one but warn.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10366 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoLibrary loading: if a DLL succeeds to load but a function is missing, also continue...
divverent [Tue, 27 Jul 2010 19:22:30 +0000 (19:22 +0000)]
Library loading: if a DLL succeeds to load but a function is missing, also continue to the next one but warn.

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

13 years agomake prydon cursor absolute, not relative
divverent [Sun, 25 Jul 2010 19:39:19 +0000 (19:39 +0000)]
make prydon cursor absolute, not relative

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

13 years agofix v_flipped with near clip plane (water, warpzone)
divverent [Sun, 25 Jul 2010 18:42:31 +0000 (18:42 +0000)]
fix v_flipped with near clip plane (water, warpzone)

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

13 years agoLinux SDL/GLX: allow loading the icon from .xpm at runtime (darkplaces-icon.xpm)...
divverent [Sun, 25 Jul 2010 17:10:11 +0000 (17:10 +0000)]
Linux SDL/GLX: allow loading the icon from .xpm at runtime (darkplaces-icon.xpm). Allows for easier branding.

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

13 years agotrack if a cachepic has alpha, and turn off depth write if it does; also use alpha...
divverent [Sun, 25 Jul 2010 12:20:39 +0000 (12:20 +0000)]
track if a cachepic has alpha, and turn off depth write if it does; also use alpha-less blendfuncs if all alpha values are >= 1 and the texture has no alpha (might be a slight performance increase, but mainly to help R_BeginPolygon in 3D space)

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

13 years agobump modplug version to libmodplug-1.dll (only supports 0.8.8 upwards, sorry, but...
divverent [Mon, 26 Jul 2010 12:05:38 +0000 (12:05 +0000)]
bump modplug version to libmodplug-1.dll (only supports 0.8.8 upwards, sorry, but any versions before are broken on 64bit platforms anyway)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10365 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake prydon cursor absolute, not relative
divverent [Sun, 25 Jul 2010 19:39:19 +0000 (19:39 +0000)]
make prydon cursor absolute, not relative

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10364 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix v_flipped with near clip plane (water, warpzone)
divverent [Sun, 25 Jul 2010 18:42:31 +0000 (18:42 +0000)]
fix v_flipped with near clip plane (water, warpzone)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10363 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoLinux SDL/GLX: allow loading the icon from .xpm at runtime (darkplaces-icon.xpm)...
divverent [Sun, 25 Jul 2010 17:10:11 +0000 (17:10 +0000)]
Linux SDL/GLX: allow loading the icon from .xpm at runtime (darkplaces-icon.xpm). Allows for easier branding.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10362 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a nasty bug in refraction/water renders. It is evil that GL20TU_FIRST must be...
divverent [Sun, 25 Jul 2010 14:56:25 +0000 (14:56 +0000)]
fix a nasty bug in refraction/water renders. It is evil that GL20TU_FIRST must be matching, out of all texture units, the one of normalmaps.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10361 d7cf8633-e32d-0410-b094-e92efae38249

13 years agotrack if a cachepic has alpha, and turn off depth write if it does; also use alpha...
divverent [Sun, 25 Jul 2010 12:20:39 +0000 (12:20 +0000)]
track if a cachepic has alpha, and turn off depth write if it does; also use alpha-less blendfuncs if all alpha values are >= 1 and the texture has no alpha (might be a slight performance increase, but mainly to help R_BeginPolygon in 3D space)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10360 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoPROPERLY handle roundoff errors in drawsetcliparea
divverent [Sun, 25 Jul 2010 06:14:44 +0000 (06:14 +0000)]
PROPERLY handle roundoff errors in drawsetcliparea

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

13 years agoPROPERLY handle roundoff errors in drawsetcliparea
divverent [Sun, 25 Jul 2010 06:14:44 +0000 (06:14 +0000)]
PROPERLY handle roundoff errors in drawsetcliparea

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10359 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFix the usage of the CACHEPICFLAGS_NOTPERSISTENT flag in Draw_CachePic calls
divverent [Fri, 23 Jul 2010 19:14:21 +0000 (19:14 +0000)]
Fix the usage of the CACHEPICFLAGS_NOTPERSISTENT flag in Draw_CachePic calls

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoCRLF fixes, .gitattributes file updated
divverent [Wed, 21 Jul 2010 09:46:58 +0000 (09:46 +0000)]
CRLF fixes, .gitattributes file updated

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

13 years agoFix the usage of the CACHEPICFLAGS_NOTPERSISTENT flag in Draw_CachePic calls
divverent [Fri, 23 Jul 2010 19:14:21 +0000 (19:14 +0000)]
Fix the usage of the CACHEPICFLAGS_NOTPERSISTENT flag in Draw_CachePic calls

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10358 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoCRLF fixes, .gitattributes file updated
divverent [Wed, 21 Jul 2010 09:46:58 +0000 (09:46 +0000)]
CRLF fixes, .gitattributes file updated

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10357 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake airstopaccelerate less accidentally epic ;)
divverent [Tue, 20 Jul 2010 17:54:56 +0000 (17:54 +0000)]
make airstopaccelerate less accidentally epic ;)

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

13 years agoMerge remote branch 'origin/mirceakitsune/landing_viewshake_fix'
divverent [Tue, 20 Jul 2010 17:19:35 +0000 (17:19 +0000)]
Merge remote branch 'origin/mirceakitsune/landing_viewshake_fix'

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

13 years agoAnd my third intended change: Remove view bobbing dependencies from the gun model...
divverent [Tue, 20 Jul 2010 17:16:30 +0000 (17:16 +0000)]
And my third intended change: Remove view bobbing dependencies from the gun model bobbing. It has its own cvar and imo there's no reason to block this effect when the normal bobbing is disabled. Their intensities could also be different, which is another reason why I think this doesn't make sense.

I don't believe it should change anything for Quake players since this just allows you to disable both effects individually. If the core developers disagree please revert this change.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoSecond change: Use cos for the horizontal view bobbing while leaving sin for the...
divverent [Tue, 20 Jul 2010 17:16:27 +0000 (17:16 +0000)]
Second change: Use cos for the horizontal view bobbing while leaving sin for the vertical (old) one. This makes the view bobbing look rounder and prettier when both are enabled.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoSort this space in a more correct way while I'm at it
divverent [Tue, 20 Jul 2010 17:16:24 +0000 (17:16 +0000)]
Sort this space in a more correct way while I'm at it

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoFix some final things on my list for my effects in Darkplaces. First change: Use...
divverent [Tue, 20 Jul 2010 17:16:21 +0000 (17:16 +0000)]
Fix some final things on my list for my effects in Darkplaces. First change: Use the highpass / lowpass values in Xonotic for gun leaning / following, which are much better.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agosv_aircontrol_penalty
divverent [Tue, 20 Jul 2010 07:07:23 +0000 (07:07 +0000)]
sv_aircontrol_penalty

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

13 years agoVM_stringtokeynum: return a float, not an int
divverent [Tue, 20 Jul 2010 03:51:50 +0000 (03:51 +0000)]
VM_stringtokeynum: return a float, not an int

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

13 years agoOops, must be framerate dependent
divverent [Fri, 16 Jul 2010 22:25:31 +0000 (22:25 +0000)]
Oops, must be framerate dependent

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoFix the final details and disable by default. Use cl_bobfall 0.05 to test at a good...
divverent [Fri, 16 Jul 2010 22:25:25 +0000 (22:25 +0000)]
Fix the final details and disable by default. Use cl_bobfall 0.05 to test at a good value. Ready for testing and merging.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoMinimum necessary speed for fall-bobbing to occur
divverent [Fri, 16 Jul 2010 22:25:19 +0000 (22:25 +0000)]
Minimum necessary speed for fall-bobbing to occur

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoBounds
divverent [Fri, 16 Jul 2010 22:25:12 +0000 (22:25 +0000)]
Bounds

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoCvars. Enabled by default just for testing until everything is done.
divverent [Fri, 16 Jul 2010 22:25:06 +0000 (22:25 +0000)]
Cvars. Enabled by default just for testing until everything is done.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoThe code works as intended! Change some names and comments in the meantime.
divverent [Fri, 16 Jul 2010 22:25:00 +0000 (22:25 +0000)]
The code works as intended! Change some names and comments in the meantime.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoVery close to getting the correct maths done. It now works as intended, just need...
divverent [Fri, 16 Jul 2010 22:24:54 +0000 (22:24 +0000)]
Very close to getting the correct maths done. It now works as intended, just need to separate the swing's length and speed.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoEven closer to a senseful code. We need to get just one swing using sin()
divverent [Fri, 16 Jul 2010 22:24:42 +0000 (22:24 +0000)]
Even closer to a senseful code. We need to get just one swing using sin()

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoUse sin() for the the view going up / down. Now it needs to be arranged in a correct...
divverent [Fri, 16 Jul 2010 22:24:35 +0000 (22:24 +0000)]
Use sin() for the the view going up / down. Now it needs to be arranged in a correct way.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoMore progress, still nothing considerable
divverent [Fri, 16 Jul 2010 22:24:29 +0000 (22:24 +0000)]
More progress, still nothing considerable

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoSome comments and a view bound on the speed, which should match xyspeed's for the...
divverent [Fri, 16 Jul 2010 22:24:23 +0000 (22:24 +0000)]
Some comments and a view bound on the speed, which should match xyspeed's for the bobbing

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoMake the view slowly go back after hitting the ground. We need to do the same for...
divverent [Fri, 16 Jul 2010 22:24:17 +0000 (22:24 +0000)]
Make the view slowly go back after hitting the ground. We need to do the same for both up and down. Also use reasonable values until cvars are done.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agoAttempt to implement landing viewshake effect (the camera lowering and going back...
divverent [Fri, 16 Jul 2010 22:24:11 +0000 (22:24 +0000)]
Attempt to implement landing viewshake effect (the camera lowering and going back up when you hit the ground with speed). Code very primitive at this point, and just gets the basic calculation in place.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

13 years agofix uninitialized variable warning
havoc [Fri, 16 Jul 2010 16:29:13 +0000 (16:29 +0000)]
fix uninitialized variable warning

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

13 years agofix ~TEXF_PICMIP in DDS loading, and fix TEXF_ALPHA generation (there was a bug that...
divverent [Fri, 16 Jul 2010 09:07:42 +0000 (09:07 +0000)]
fix ~TEXF_PICMIP in DDS loading, and fix TEXF_ALPHA generation (there was a bug that caused TEXF_ALPHA to never be set, now it is set if the caller requested it AND the texture has alpha)

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

13 years agocvar: r_mipnormalmaps
divverent [Fri, 16 Jul 2010 08:42:48 +0000 (08:42 +0000)]
cvar: r_mipnormalmaps

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

13 years agomake airstopaccelerate less accidentally epic ;)
divverent [Tue, 20 Jul 2010 17:54:56 +0000 (17:54 +0000)]
make airstopaccelerate less accidentally epic ;)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10356 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoMerge remote branch 'origin/mirceakitsune/landing_viewshake_fix'
divverent [Tue, 20 Jul 2010 17:19:35 +0000 (17:19 +0000)]
Merge remote branch 'origin/mirceakitsune/landing_viewshake_fix'

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10355 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoAnd my third intended change: Remove view bobbing dependencies from the gun model...
divverent [Tue, 20 Jul 2010 17:16:30 +0000 (17:16 +0000)]
And my third intended change: Remove view bobbing dependencies from the gun model bobbing. It has its own cvar and imo there's no reason to block this effect when the normal bobbing is disabled. Their intensities could also be different, which is another reason why I think this doesn't make sense.

I don't believe it should change anything for Quake players since this just allows you to disable both effects individually. If the core developers disagree please revert this change.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10354 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoSecond change: Use cos for the horizontal view bobbing while leaving sin for the...
divverent [Tue, 20 Jul 2010 17:16:27 +0000 (17:16 +0000)]
Second change: Use cos for the horizontal view bobbing while leaving sin for the vertical (old) one. This makes the view bobbing look rounder and prettier when both are enabled.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10353 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoSort this space in a more correct way while I'm at it
divverent [Tue, 20 Jul 2010 17:16:24 +0000 (17:16 +0000)]
Sort this space in a more correct way while I'm at it

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10352 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFix some final things on my list for my effects in Darkplaces. First change: Use...
divverent [Tue, 20 Jul 2010 17:16:21 +0000 (17:16 +0000)]
Fix some final things on my list for my effects in Darkplaces. First change: Use the highpass / lowpass values in Xonotic for gun leaning / following, which are much better.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10351 d7cf8633-e32d-0410-b094-e92efae38249

13 years agosv_aircontrol_penalty
divverent [Tue, 20 Jul 2010 07:07:23 +0000 (07:07 +0000)]
sv_aircontrol_penalty

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10350 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoVM_stringtokeynum: return a float, not an int
divverent [Tue, 20 Jul 2010 03:51:50 +0000 (03:51 +0000)]
VM_stringtokeynum: return a float, not an int

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10349 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoOops, must be framerate dependent
divverent [Fri, 16 Jul 2010 22:25:31 +0000 (22:25 +0000)]
Oops, must be framerate dependent

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10348 d7cf8633-e32d-0410-b094-e92efae38249