]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
divverent [Tue, 14 Sep 2010 18:46:41 +0000 (18:46 +0000)]
TraceBrush: use in Collision_ClipToGenericEntity
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10459
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8932241cf6202daaa27b839eba3198eae61f75f7
divverent [Tue, 14 Sep 2010 18:46:37 +0000 (18:46 +0000)]
add a TraceBrush function to all model types, and implement it for BIH and Q3BSP
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10458
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b86dc159d01c93c80a00afe9f40e48dd0a8206d6
divverent [Sat, 11 Sep 2010 00:20:09 +0000 (00:20 +0000)]
fix an inverted return value
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10455
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e31ea19a584eb7675ebb9133d665d44ef9438a3e
divverent [Fri, 10 Sep 2010 23:23:22 +0000 (23:23 +0000)]
add a type cast for C++
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10454
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9e160a615b83477f8eec2ba38e16afff6ea9bac4
divverent [Fri, 10 Sep 2010 11:42:56 +0000 (11:42 +0000)]
make the win32 case compile too (hope it doesn't break TOO horribly above 4G RAM, someone please test)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10453
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
abbafda6735457111f0fffa4e168d84b0a530d85
divverent [Fri, 10 Sep 2010 11:26:57 +0000 (11:26 +0000)]
add sys_memsize_virtual and sys_memsize_physical info cvars
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10452
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
36bcd3b371a113ce5cf3e91f7143e18672fe9c93
divverent [Thu, 9 Sep 2010 07:37:50 +0000 (07:37 +0000)]
do sound occlusion only once per sound, not once per listener channel
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10451
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1c4c36dd5a6587988ac63db25c246c96fba749f4
divverent [Thu, 9 Sep 2010 06:55:01 +0000 (06:55 +0000)]
remove sparks if slower than sqrt(0.03)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10450
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a47d6d807b1b080ae1c56e6c17c2fec217cd8e89
divverent [Thu, 9 Sep 2010 06:54:58 +0000 (06:54 +0000)]
sound occlusion: use PVS by default, make the cvar able to toggle between PVS and LineOfSight occlusion
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10449
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
00f9f334acf035b06ca4381b1af3f3b75af5826a
divverent [Thu, 9 Sep 2010 06:54:55 +0000 (06:54 +0000)]
fix two warpzone related PVS bugs
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10448
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
44eae3fb425b13b170cbb479017715bb03e9d30c
divverent [Tue, 7 Sep 2010 07:37:02 +0000 (07:37 +0000)]
new option -benchmarkruns - if specified, the given number of benchmark runs is performed for -benchmark
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10447
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b035320854424884c174e6b33092f63c4158a3a3
divverent [Mon, 6 Sep 2010 06:21:51 +0000 (06:21 +0000)]
fix CSQC being unable to use the "effects" field as its fieldoffset never got initialized
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10446
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e46b145fb645c005413c7f34360d1d02498f8898
divverent [Mon, 6 Sep 2010 05:09:56 +0000 (05:09 +0000)]
Allow to type the utf8 Euro currency sign (to work around windows-1252 encoding)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10445
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2521205903a3cab3b36f3450485a266a4e86085f
divverent [Mon, 6 Sep 2010 05:09:53 +0000 (05:09 +0000)]
make ctrl-key shortcuts in message mode display chars from the charmap even with utf8 enabled
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10444
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
442772ff530cb93073f2ea7207de762ec74d34ce
divverent [Sun, 5 Sep 2010 17:34:29 +0000 (17:34 +0000)]
new cvars: r_drawparticles_nearclip_min and r_drawparticles_nearclip_max, use a range and fading for near clip of particles for speed optimization (fade them out before they become fullscreen)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10443
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6f6da45f360f10451ac20ca2c1fa1c64dd992239
divverent [Sun, 5 Sep 2010 15:48:51 +0000 (15:48 +0000)]
reorganize sv_public code; add a level -3 that blocks at getchallenge level, but -2 blocks at connect level (srcon needs getchallenge, so -3 also blocks srcon); also sv_public -2 will make connect attempts show the string in sv_public_rejectreason
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10442
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
62b1a43c04dd50f4e8a0bfa00974eb880c3b0795
divverent [Sat, 4 Sep 2010 15:32:12 +0000 (15:32 +0000)]
clean up u8_StringLengthNoColors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10440
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bb3eeea785546930f5820116a01058a0b86718c9
divverent [Sat, 4 Sep 2010 15:32:09 +0000 (15:32 +0000)]
Since u8_prevbyte skips invalid chars on purpose, it can go before the ] if invalid utf8 chars get pasted in the console edit line. It's even possible to delete the ].
Fix this bug by giving to u8_prevbyte the edit line without ].
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10439
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
de39b9746aa912589462b418e2a9af3d69b063c2
divverent [Sat, 4 Sep 2010 15:32:06 +0000 (15:32 +0000)]
Fix u8_COM_StringLengthNoColors not counting many ASCII chars (up to '?')
Better handling of invalid chars in u8_COM_StringLengthNoColors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10438
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f0eda58867febcd4dc0f6c6be401d37000d136c5
divverent [Sat, 4 Sep 2010 14:47:52 +0000 (14:47 +0000)]
Adding GAME_XONOTIC and recognizing xonotic executable names
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10437
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1c1d251ba80d985f8b7f641f3e9baa0584eb2a86
divverent [Fri, 3 Sep 2010 05:32:15 +0000 (05:32 +0000)]
build the string correctly
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10436
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e8d1f7bc14b8bed1bf23c4256b22830f1c2ffe0b
divverent [Fri, 3 Sep 2010 05:23:15 +0000 (05:23 +0000)]
fix connect help
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10435
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1b8df685ec8616067bea6a892c294239c27e94f5
divverent [Fri, 3 Sep 2010 05:20:33 +0000 (05:20 +0000)]
added arg: connect-userinfo; works like this: "connect server password foobar" will connect to server, and add \password\foobar to the infostring (works to connect to FTEQW passworded servers)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10434
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e20a7791af80303078df78c93a261d291f3f0b19
divverent [Sun, 29 Aug 2010 18:33:06 +0000 (18:33 +0000)]
curl: strip user/pass from URLs on display
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10429
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a41cdf058486349769bcd97fe7ae60f0a3e3afcf
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
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 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 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
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
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
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
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, 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 [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
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
::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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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