]>
git.xonotic.org Git - xonotic/darkplaces.git/log
havoc [Sun, 29 Aug 2010 11:02:44 +0000 (11:02 +0000)]
overhauled mod_q3bsp_lightmapmergepower code, to fix very weird bugs
with misnumbered lightmaps, and make all textures in the set the same
size (better performance on drivers that dislike texture size changes)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10428
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2a72af26a6cbb8f1b6cf5085e7cc0a5c58e1987c
havoc [Sun, 29 Aug 2010 11:02:44 +0000 (11:02 +0000)]
overhauled mod_q3bsp_lightmapmergepower code, to fix very weird bugs
with misnumbered lightmaps, and make all textures in the set the same
size (better performance on drivers that dislike texture size changes)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10428
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 27 Aug 2010 21:58:41 +0000 (21:58 +0000)]
fix a -lX11 typo
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10427
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 27 Aug 2010 21:58:41 +0000 (21:58 +0000)]
fix a -lX11 typo
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10427
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
639abfaa1b2ac3cd2bd22a9be9ea5bd8921162f6
divverent [Fri, 27 Aug 2010 19:21:43 +0000 (19:21 +0000)]
fix nogravityonground description
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10426
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ebb7fb6477a3f061b8a4861f5f2a1c624367ecdc
havoc [Fri, 27 Aug 2010 19:18:33 +0000 (19:18 +0000)]
don't use sv_gameplayfix_stepmultipletimes by default (except in Nexuiz)
this fixes an sv_jumpstep-like behavior seen in quake dm2 where you have
difficulty falling into lava pits
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10425
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7f0d5c536b8c617407f6abfed913f6dddb65e2b8
divverent [Fri, 27 Aug 2010 19:21:43 +0000 (19:21 +0000)]
fix nogravityonground description
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10426
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Fri, 27 Aug 2010 19:18:33 +0000 (19:18 +0000)]
don't use sv_gameplayfix_stepmultipletimes by default (except in Nexuiz)
this fixes an sv_jumpstep-like behavior seen in quake dm2 where you have
difficulty falling into lava pits
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10425
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 27 Aug 2010 16:48:41 +0000 (16:48 +0000)]
PROPERLY load the icon in SDL/X11
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10424
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 27 Aug 2010 16:48:41 +0000 (16:48 +0000)]
PROPERLY load the icon in SDL/X11
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10424
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a37cd455150d17f68eec25ae6fa57808d940f1ae
divverent [Fri, 27 Aug 2010 14:18:30 +0000 (14:18 +0000)]
vid_sdl: also upload a smooth netwm icon if possible, by fetching the X11 window ID and using Xlib code on it (code is inactive on SDL 1.3+, as 1.3 supports NETWM icons natively)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10423
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9e2a4e3392ee64e45881cddd18856a5472abda28
divverent [Fri, 27 Aug 2010 14:18:30 +0000 (14:18 +0000)]
vid_sdl: also upload a smooth netwm icon if possible, by fetching the X11 window ID and using Xlib code on it (code is inactive on SDL 1.3+, as 1.3 supports NETWM icons natively)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10423
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 27 Aug 2010 05:43:12 +0000 (05:43 +0000)]
SDL: also use a non-XPM icon darkplaces-icon.tga but only if SDL is >= 1.3 (SDL 1.2 doesn't support smooth alpha transparency on window icons)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10422
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e0501f3610f2a303c869b02533cb8f5d66e10ab
divverent [Fri, 27 Aug 2010 05:43:07 +0000 (05:43 +0000)]
GLX: use _NET_WM_ICON additionally to the xpm icon for most current window managers
_NET_WM_ICON is generated from darkplaces-icon.tga, darkplaces-icon2.tga, darkplaces-icon3.tga in this order
NOTE: at least GNOME displays the first icon only, so this one should have a nice resolution like 64x64
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10421
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ff0866cefb73303f135a4e27eec21e8a24662912
divverent [Fri, 27 Aug 2010 05:43:03 +0000 (05:43 +0000)]
do not use partial lightmap updates for lightmap merging
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10420
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
217fc84de2c72d18d19b6da9786e49298de90f4b
divverent [Fri, 27 Aug 2010 05:43:12 +0000 (05:43 +0000)]
SDL: also use a non-XPM icon darkplaces-icon.tga but only if SDL is >= 1.3 (SDL 1.2 doesn't support smooth alpha transparency on window icons)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10422
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 27 Aug 2010 05:43:07 +0000 (05:43 +0000)]
GLX: use _NET_WM_ICON additionally to the xpm icon for most current window managers
_NET_WM_ICON is generated from darkplaces-icon.tga, darkplaces-icon2.tga, darkplaces-icon3.tga in this order
NOTE: at least GNOME displays the first icon only, so this one should have a nice resolution like 64x64
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10421
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 27 Aug 2010 05:43:03 +0000 (05:43 +0000)]
do not use partial lightmap updates for lightmap merging
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10420
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 24 Aug 2010 17:26:01 +0000 (17:26 +0000)]
overhauled dynamic vertex rendering in DX9 based on research by mh that showed the DrawIndexedPrimitiveUP function is many times faster than using dynamic vertex buffers
applied a patch from mh to the D3D Present handling to better cope with lost devices
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10419
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 24 Aug 2010 17:19:14 +0000 (17:19 +0000)]
fix some HLSL shader compile errors
disable check for gl_vbo in one part of surface setup code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10418
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 24 Aug 2010 17:16:29 +0000 (17:16 +0000)]
fix previous warning fix that only worked properly for MINGW
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10417
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Mon, 23 Aug 2010 15:07:35 +0000 (15:07 +0000)]
don't use TEXF_ALLOWUPDATES on fully-updated textures such as video
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10415
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
50614c010dff980a99dae156c35d392c64d58216
havoc [Sun, 22 Aug 2010 16:52:33 +0000 (16:52 +0000)]
disable USE_WSPIAPI_H by default, since it only works with -DSUPPORTIPV6
which is also disabled
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10413
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9b483e302a32f2e76f55dc2660e17d7f7c5e96cb
havoc [Sun, 22 Aug 2010 16:48:29 +0000 (16:48 +0000)]
change R_Upload error from Host_error to Sys_Error, added texture name
to the message
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10412
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4bfb0cbab250c020cfb990f347366f1a4eca79cd
havoc [Mon, 23 Aug 2010 15:09:37 +0000 (15:09 +0000)]
split and overhauled R_Upload into two functions:
R_UploadPartialTexture - does a partial update for real, not used by
anything if gl_nopartialtextureupdates is on
R_UploadFullTexture - takes only new pixel data, does appropriate
scaling and uploads to video memory
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10416
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Mon, 23 Aug 2010 15:07:35 +0000 (15:07 +0000)]
don't use TEXF_ALLOWUPDATES on fully-updated textures such as video
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10415
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sun, 22 Aug 2010 16:52:33 +0000 (16:52 +0000)]
disable USE_WSPIAPI_H by default, since it only works with -DSUPPORTIPV6
which is also disabled
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10413
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sun, 22 Aug 2010 16:48:29 +0000 (16:48 +0000)]
change R_Upload error from Host_error to Sys_Error, added texture name
to the message
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10412
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sun, 22 Aug 2010 15:13:36 +0000 (15:13 +0000)]
support more level network eyes, and make them static instead of on-stack. Now 8k of memory are used for warpzones.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10411
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b6ed613006398a0962bd09c8bf89e68e5cd2ec7c
havoc [Sat, 21 Aug 2010 22:11:10 +0000 (22:11 +0000)]
fix errors related to cl_rollangle on dedicated servers where the cvar
was not being registered
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10410
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3c3e4f3bcee14585fb284284b143ece0c126dd75
divverent [Sun, 22 Aug 2010 15:13:36 +0000 (15:13 +0000)]
support more level network eyes, and make them static instead of on-stack. Now 8k of memory are used for warpzones.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10411
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sat, 21 Aug 2010 22:11:10 +0000 (22:11 +0000)]
fix errors related to cl_rollangle on dedicated servers where the cvar
was not being registered
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10410
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Fri, 20 Aug 2010 12:50:53 +0000 (12:50 +0000)]
migrate the libjpeg options to per-target scripting, and default the
libjpeg linking off on Mac OS X because we have to provide our own in
the .app
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10409
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f8972947255e78d99a3497c8dcb2531c6be217a2
havoc [Fri, 20 Aug 2010 12:50:53 +0000 (12:50 +0000)]
migrate the libjpeg options to per-target scripting, and default the
libjpeg linking off on Mac OS X because we have to provide our own in
the .app
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10409
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 20 Aug 2010 12:30:43 +0000 (12:30 +0000)]
remove DP_LINK_TO_JPEG from makefile, as this is default now
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10408
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Fri, 20 Aug 2010 12:30:43 +0000 (12:30 +0000)]
remove DP_LINK_TO_JPEG from makefile, as this is default now
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10408
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1af047cda084ba4eef3a77271f3d32957a06eb66
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
::stable-branch::merge=
05b2bea177017a0e9f6a03609e9f9521e2e2941f
havoc [Thu, 19 Aug 2010 17:34:47 +0000 (17:34 +0000)]
fixed some issues with how D3D=1 worked in the makefile
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10406
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
819764171ec0f979dd6ab46a5d53e7b5221725db
havoc [Thu, 19 Aug 2010 15:46:48 +0000 (15:46 +0000)]
link to libjpeg by default when built with gcc or mingw
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10404
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c2fce368682ff4578dc47cfb4d7efe6d1284be8b
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
::stable-branch::merge=
3b913d2ec9c3b875521aa43e5b5147ffdaceeb9f
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
::stable-branch::merge=
e685876f8e234d1a353bfdbc89a0b0e022fe520c
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
::stable-branch::merge=
d417a11b351178a0b53895632f3f4292025e6599
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
::stable-branch::merge=
0d12e67fdbdacfd9ffe88db9ae03dc995ae2d7ca
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
::stable-branch::merge=
0c9c6ff79348c1fdf0fcb05e2c96018fedc5a238
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
::stable-branch::merge=
b0aee41ce927ef164b1e02b466a293172402e77e
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
::stable-branch::merge=
e2a01a8fbc4ae33827a76531919ab72badf12b76
havoc [Thu, 19 Aug 2010 15:47:13 +0000 (15:47 +0000)]
add versioned dll names for a bunch of things
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10405
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
217d41fc47bbf046bc5338f1a8e497592a0cc3f1
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
::stable-branch::merge=
3474335ffdd2c762fd8067c687fae7928bc2a508
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
::stable-branch::merge=
e2464fa30eef49aa21b08f1e1089b9542bd4b34e
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
::stable-branch::merge=
15ba263dfc057719e51ffd7ba6ecb0fe7efb400c
havoc [Thu, 19 Aug 2010 17:44:57 +0000 (17:44 +0000)]
fix compilation of sdl and server builds when SUPPORTD3D is defined
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10407
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 19 Aug 2010 17:34:47 +0000 (17:34 +0000)]
fixed some issues with how D3D=1 worked in the makefile
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10406
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 19 Aug 2010 15:47:13 +0000 (15:47 +0000)]
add versioned dll names for a bunch of things
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10405
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 19 Aug 2010 15:46:48 +0000 (15:46 +0000)]
link to libjpeg by default when built with gcc or mingw
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10404
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 19 Aug 2010 15:15:32 +0000 (15:15 +0000)]
fix a compile error
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10403
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 19 Aug 2010 14:38:49 +0000 (14:38 +0000)]
fix almost all g++ -pedantic warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10402
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 19 Aug 2010 14:36:01 +0000 (14:36 +0000)]
load d3dx9_*.dll dynamically to get D3DXCompileShader to fix a compile
error with mingw headers, this also means it doesn't matter which
version is present on the user's system
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10401
d7cf8633 -e32d-0410-b094-
e92efae38249
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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