]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
divverent [Sat, 16 Jul 2011 18:54:18 +0000 (18:54 +0000)]
fix two errors in DDS format as written by DP
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11247
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8b77d5651e90b342b1b2b3cdb768294a6619e353
havoc [Wed, 13 Jul 2011 16:37:38 +0000 (16:37 +0000)]
added a FIXME comment - R_CompleteLightPoint should count bouncegrid
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11246
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
39f47d2bb01255d78ed971bf12108c95cf96f81d
eihrul [Mon, 11 Jul 2011 09:17:39 +0000 (09:17 +0000)]
handle IQM models with no blend weights
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11245
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3d33cdedf26c48222748feebed9dff29b687dcb0
eihrul [Sun, 10 Jul 2011 19:14:37 +0000 (19:14 +0000)]
tab formatting fix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11244
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cb9d7e7b986a54aa6237d921f812289a03c85f5b
eihrul [Sun, 10 Jul 2011 19:10:32 +0000 (19:10 +0000)]
build static frame for IQM models with no animations
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11243
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4c61497f6bb3694fa9cd4457e0c5d0dbf1e95ecd
havoc [Sat, 9 Jul 2011 20:27:07 +0000 (20:27 +0000)]
added -developer3 for crazy debugging sessions (gl_printcheckerror spew)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11242
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7b26a1146198a553b373ac59406be611e34c50d6
havoc [Sat, 9 Jul 2011 20:25:49 +0000 (20:25 +0000)]
print shader compile and link logs always if developer_extra 1 (you get
this with -developer2 on the commandline)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11241
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef1af8732c71134a950ef72f14627a39d29cac0d
divverent [Sat, 9 Jul 2011 14:08:53 +0000 (14:08 +0000)]
Update the default values for the motionblur..... I think this is basically done at this point.
From: Samual <samual@xonotic.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11240
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
13aa54b4f12b030597f1195738312e86ae95d601
divverent [Sat, 9 Jul 2011 14:08:49 +0000 (14:08 +0000)]
Add/update cvars and such... Almost done now basically. Just a bit of testing left.
From: Samual <samual@xonotic.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11239
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ee3262b2e4f78fdcb461b6a431f178cc314eaf6d
divverent [Sat, 9 Jul 2011 14:08:45 +0000 (14:08 +0000)]
Change how the factor is calculated and set it up to be finished
From: Samual <samual@xonotic.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11238
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5133018e062d31daafb69447e17d5b8c0ce0be6e
divverent [Sat, 9 Jul 2011 14:08:41 +0000 (14:08 +0000)]
Begin a quick re-write of how motionblur values are calculated
From: Samual <samual@xonotic.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11237
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0b01a8b685fecdd55eefbe84a3c26901c1926a4a
divverent [Sat, 9 Jul 2011 13:56:23 +0000 (13:56 +0000)]
Different fade rates for adapting to bright scenes and adapting to dark scenes
From: Samual <samual@xonotic.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11236
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
731676e9941abc46e66d54f84c7e3d65c7ef3f40
havoc [Sat, 9 Jul 2011 07:35:47 +0000 (07:35 +0000)]
changed qwmasters - kubus.rulez.pl is down, added qwmaster.fodquake.net
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11235
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0e93920bd93b5170829bd93ad5f2022ba867d3e9
Rudolf Polzer [Sat, 23 Jul 2011 08:19:39 +0000 (10:19 +0200)]
Merge branch 'div0-stable' of git://git.xonotic.org/xonotic/darkplaces into div0-stable
divverent [Fri, 8 Jul 2011 19:33:54 +0000 (19:33 +0000)]
fix gl_mesh_testmanualfeeding
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11234
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
eb3110f1151a26dafff642d6214c562a4851de91
divverent [Fri, 8 Jul 2011 08:27:05 +0000 (08:27 +0000)]
OS X compile: do not build the AGL target by default (use make cl-release to build it anyway)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11233
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d91a9af0b94761f863408e7120d7c48ac2e72406
Rudolf Polzer [Fri, 8 Jul 2011 08:25:07 +0000 (10:25 +0200)]
OS X compile: do not build the AGL target by default (use make cl-release to build it anyway)
divverent [Tue, 5 Jul 2011 19:48:04 +0000 (19:48 +0000)]
DP_SND_SOUND7_WIP1
sound7() function, supporting more sound channels (-128 to 127, negative ones being additional auto-channels, positive ones being additional single-channels)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11232
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
309ece3425957096f18a5521316e1983a37ea904
divverent [Sat, 2 Jul 2011 15:23:35 +0000 (15:23 +0000)]
move gecko builtins to menudefs.qc
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11231
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
836e971163f6066cb5fae873b9a456753f79a18c
havoc [Fri, 1 Jul 2011 05:42:57 +0000 (05:42 +0000)]
effectinfo velocitymultiplier defaults to 0 again
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11230
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ed8d0725afa9ebc075da0df1306e1cc41bb56c2d
havoc [Fri, 1 Jul 2011 05:40:29 +0000 (05:40 +0000)]
fix default effectinfo gravity and size
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11229
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f8b93f14e3cc4324eb93f4b47745d6ce5d89400d
havoc [Fri, 1 Jul 2011 05:25:04 +0000 (05:25 +0000)]
default effectinfo velocitymultiplier to 0 in nexuiz mode
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11228
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
caf3db73f974fb65d9718eb3cc122e6c6369336a
havoc [Thu, 30 Jun 2011 04:55:23 +0000 (04:55 +0000)]
fix some loading errors on effectinfo.txt where variables were not being
cleared properly
changed default effectinfo velocitymultiplier from 0 to 1
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11227
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
84ee5204e05171d659fedd7e27041768170118b9
havoc [Tue, 28 Jun 2011 08:12:15 +0000 (08:12 +0000)]
fix offsetmapping without a q3 shader on Q1BSP and MDL
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11226
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2bc57e09fc5ad356b342bb0dc466b5a761583802
havoc [Tue, 28 Jun 2011 00:55:10 +0000 (00:55 +0000)]
don't spam joy_active notices with developer_extra
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11225
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cf74e01c006d2937bf1e3a522efc7b2dd0f40ba2
divverent [Mon, 27 Jun 2011 14:05:26 +0000 (14:05 +0000)]
prevent segfault caused by stringlistsort
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11224
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e24277377e64376fe6a8bbbdfad73f614f3909bf
havoc [Mon, 27 Jun 2011 02:20:27 +0000 (02:20 +0000)]
fix C++ compile errors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11223
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6ad14022e79720dfd015045545f889837d18e92e
havoc [Mon, 27 Jun 2011 02:15:09 +0000 (02:15 +0000)]
fix the solid water bug for real
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11222
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b32e6e3114c2bcbe6737cbacd1e66f912b2340ab
havoc [Mon, 27 Jun 2011 02:10:35 +0000 (02:10 +0000)]
another attempt at fixing solid water in the dedicated server
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11221
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c7bc9edf299b5f7f36325de8a5fecb0dfd9b41da
havoc [Sun, 26 Jun 2011 22:37:13 +0000 (22:37 +0000)]
implemented DP_ENT_TRAILEFFECTNUM extension, which allows
self.traileffectnum = particleeffectnum("mycustomeffect") on server
entities, rather than requiring csqc for trailparticles()
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11220
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5070a71b37b3dde085b45ff86fd36c5bb274a039
divverent [Sun, 26 Jun 2011 19:50:50 +0000 (19:50 +0000)]
fix a bug in EntityFrame5 stats delta bits handling
It forgot to memset the stats delta bits to 0, so it marked stats as being sent
in the database that were not. This clearly caused too large resend data when
packet loss occurred.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11219
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bbfa614b656aa345e70174b6fdccd1804ca42fb6
divverent [Sun, 26 Jun 2011 19:07:03 +0000 (19:07 +0000)]
funny feature: cl_lerpexcess
Hides the effect of packet loss for linear motion. Mispredicts nonlinear
motion, of course. Can be configured to a max number of server packets lost
that it will try to compensate for. Of course off by default.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11218
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1a606ca4c462e8a9a76cd5e7e085efbecbe90009
divverent [Sun, 26 Jun 2011 09:09:15 +0000 (09:09 +0000)]
add a workaround to make the ^ key work on some X.org systems
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11217
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
61227089d1b7eaf494a1a046081d85c58581951e
divverent [Sun, 26 Jun 2011 09:09:13 +0000 (09:09 +0000)]
work around broken XLookupKeysym returning "" on XK_asciicircum
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11216
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c0063f75ee03156d5bfc12efbad687e4863db964
havoc [Sun, 26 Jun 2011 04:52:15 +0000 (04:52 +0000)]
cleaned up the fix for solid water in q1bsp dedicated servers
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11215
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7b54444c08e4d206acaf8e302be47e6dfe1f9b7d
havoc [Sun, 26 Jun 2011 04:50:41 +0000 (04:50 +0000)]
fix q1bsp dedicated server collisions, a simplification of the q1bsp
loading code was breaking the material information and thus water was
made solid
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11214
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e41d58386ed371c0ce5eeea75df702b490372df
havoc [Fri, 24 Jun 2011 01:38:21 +0000 (01:38 +0000)]
fixed gfx/menuplyr handling - Draw_NewPic now flags the cachepic_t with
CACHEPICFLAG_NEWPIC which disables texflags comparisons
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11213
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8b0fbc64175362acf3ea872029a423012b76a4f8
havoc [Thu, 23 Jun 2011 07:21:55 +0000 (07:21 +0000)]
draw weapons on sbar at full opacity like they are in mission packs
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11212
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8b5a5ec0447c1e5062781142501e1b818fad5eb9
havoc [Thu, 23 Jun 2011 05:41:53 +0000 (05:41 +0000)]
fix model loading memory corruption errors related to
r_enableshadowvolumes 0, and also potential memory corruption errors
related to numvertices <= 65536
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11211
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e2da2ae1092579c392c7bd4fc9e1b65312f0fc84
havoc [Thu, 23 Jun 2011 03:12:27 +0000 (03:12 +0000)]
more rework of r_shadow_bouncegrid, now dynamic mode performs somewhat
better, but still without the artifacts it used to have
added more static mode cvars to differentiate optimal settings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11210
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fc7a6cd8936ce095824fbe9aeca99331322a8f6a
havoc [Thu, 23 Jun 2011 02:44:24 +0000 (02:44 +0000)]
added r_shadow_bouncegrid 2 which disables rtlights and just renders the
bouncegrid
reworked several aspects of bouncegrid, it has less grid artifacts now
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11209
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9855b6cf603522523529940c9df8827e7d0c2f91
havoc [Wed, 22 Jun 2011 20:13:42 +0000 (20:13 +0000)]
added sv_gameplayfix_q1bsptracelinereportstexture cvar (default 1), to
allow people to disable the surface-based traceline if they so desire
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11208
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9b73f5e152089c02f4157b4f3cddcc884e3648cd
divverent [Tue, 21 Jun 2011 20:33:09 +0000 (20:33 +0000)]
"real" Unicode upper/lowercase (only 1:1 mappings, though)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11207
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3ceec78e79383ada2e6abe25e5a6e5f067259427
havoc [Mon, 20 Jun 2011 05:29:39 +0000 (05:29 +0000)]
fix two typos in DP_PHYSICS_ODE explanation (thanks FrikaC for pointing
these out)
synchronize dpextensions.qc files (for anyone reading the dpmod one)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11206
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
90c25c516ee8ba2b285e10f31896e4c0ceb29185
havoc [Sun, 19 Jun 2011 19:40:06 +0000 (19:40 +0000)]
change default r_texture_dds_load_logfailure to 0 as was intended
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11204
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
94a5be97432b0a538c0200cd0c837253b65633bf
divverent [Tue, 14 Jun 2011 18:55:08 +0000 (18:55 +0000)]
fix entity networking AGAIN
Do NOT inhibit sending EntityState5 removes for CSQC entities!
These entities may be needed for state changes.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11200
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2000fe0dea529231a494c63436f171829cbf43e5
divverent [Mon, 13 Jun 2011 18:34:50 +0000 (18:34 +0000)]
fix wrong array sizes in MODE_WATER in softrast causing an overrun
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11199
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e1cc58c8345fbadd75421fa7843ec19bdf0b8681
divverent [Mon, 13 Jun 2011 18:34:46 +0000 (18:34 +0000)]
fix some warnings about useless code (unsigned < 0, x = x)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11198
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
76ac9a336b02cf18504e9c3253294e8058cdc3dc
divverent [Mon, 13 Jun 2011 18:28:06 +0000 (18:28 +0000)]
fix detection of multisampling for ATC
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11197
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
67046d5bb087c89301a4a645a5f294fe2c4da207
havoc [Mon, 13 Jun 2011 17:31:58 +0000 (17:31 +0000)]
refactored MSG_ReadString to be nicer code (and fix a potentially uninitialized variable warning)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11196
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
18ebdf763dbed55665bd08d7eabad958bfb345f6
divverent [Mon, 13 Jun 2011 07:10:08 +0000 (07:10 +0000)]
MSG_ReadString: if hitting the max length of the string, continue to read until NUL anyway (prevents msg_badread when reading an overlong string)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11195
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7c586d061e7308e0e8164827fa0e14b470921d67
divverent [Sun, 12 Jun 2011 19:59:24 +0000 (19:59 +0000)]
make "exec" accept wildcards
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11194
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
adbccd5c89a88e85b2a9e8f9e93120c171e01a6e
divverent [Sun, 12 Jun 2011 19:59:21 +0000 (19:59 +0000)]
remove duplicate names from file search results
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11193
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e97faa7f06e7821c32fb675cecb474e07ce55df6
havoc [Wed, 8 Jun 2011 20:32:11 +0000 (20:32 +0000)]
fix a crash on saving a game
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11192
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
11affacc847ea4174861a4837fcd8d39e7b81f1c
havoc [Wed, 8 Jun 2011 19:23:52 +0000 (19:23 +0000)]
reworked progs loading so that entvars_t and globalvars_t are no longer
required to match (if they do match, the relevant fields will match the
structs, otherwise name lookups are used), this means the PROGHEADER_CRC
no longer has to match either... and same for csqc and menuqc
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11190
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
135f08ba52321984c05e36cdf42ad81420a4d2fd
divverent [Wed, 8 Jun 2011 19:35:54 +0000 (19:35 +0000)]
use subtractive blend equation to support negative v_brightness; support smaller-than-1 contrast
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11191
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
96218fbe352690c1092b46731be16bda117b2b93
havoc [Wed, 8 Jun 2011 18:03:19 +0000 (18:03 +0000)]
eliminated S_LockSfx and S_UnlockSfx which were not thread-safe and
could cause sounds to leak across multiple levels, cd play/loop now
immediately unload previous music track
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11189
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
37c4042c3dbb546c53bc5de8d556d2469b49289e
havoc [Wed, 8 Jun 2011 17:36:16 +0000 (17:36 +0000)]
implemented r_transparent_alphatocoverage 2 which promotes alphablend if
desired to ATC, the default is 1 (only promotes alphatest)
enable GL_MULTISAMPLE during extension detection to make things work
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11188
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
57d7496c097df506f385c4a301173e7576c987c7
havoc [Wed, 8 Jun 2011 13:33:46 +0000 (13:33 +0000)]
reworked use of alphatest - now only GL11/GL13/GLES1 paths use it, other
paths use SHADERPERMUTATION_ALPHAKILL (including the SOFT path)
reworked r_transparent_alphatocoverage, it no longer needs
vid_multisampling
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11186
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3b5563d41ef96889a5ae6813f0a73cea27a851df
divverent [Sun, 5 Jun 2011 14:55:41 +0000 (14:55 +0000)]
initial attempt do do r_trippy in HLSL
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11181
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
06e741c847a22b0510d83629650954cab0834202
havoc [Wed, 8 Jun 2011 13:20:59 +0000 (13:20 +0000)]
reduce cvar spam when using developer_extra
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11185
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e7c1f7ddb295ad2efb109bb9e054857b809386c4
havoc [Wed, 8 Jun 2011 15:47:32 +0000 (15:47 +0000)]
disable sv_gameplayfix_nudgeoutofsolid by default until we figure out
how to handle multiple plane intersections
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11187
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
908afe190b1bec6dd5cbdc166deb7cd928c88304
havoc [Sat, 28 May 2011 17:50:38 +0000 (17:50 +0000)]
reworked sv_gameplayfix_nudgeoutofsolid, it now begins with an enlarged
start position test and nudges out of solids, then does the move, this
should reduce collision issues with triangle mesh brushes in steelstorm,
renamed sv_gameplayfix_nudgeoutofsolid_bias to
sv_gameplayfix_nudgeoutofsolid_separation with 0.03125 as default
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11169
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
25c09ca585e81bf9eb236a339ae5dcd64f63b679
divverent [Tue, 7 Jun 2011 09:32:30 +0000 (09:32 +0000)]
theora encoding: simplify; bump default quality to 48 as that is what encoder_example uses
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11184
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ffa2dfcb8f656bce0555cb4c2e08a4bc9315c4e9
divverent [Tue, 7 Jun 2011 09:22:17 +0000 (09:22 +0000)]
theora encoding: allow both bitrate and quality to be -1 for insane quality
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11183
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bd172244c077be2f4f13caf8cabd022fcad4bd33
divverent [Tue, 7 Jun 2011 07:22:54 +0000 (07:22 +0000)]
theora encoding: set VP3 compatibility mode. This SHOULD fix issues with youtube.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11182
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c02cfddeff5b18cd3eb33600a5b188b8c3255cd3
havoc [Sat, 28 May 2011 17:50:38 +0000 (17:50 +0000)]
UNMERGE! reworked sv_gameplayfix_nudgeoutofsolid, it now begins with an enlarged
start position test and nudges out of solids, then does the move, this
should reduce collision issues with triangle mesh brushes in steelstorm,
renamed sv_gameplayfix_nudgeoutofsolid_bias to
sv_gameplayfix_nudgeoutofsolid_separation with 0.03125 as default
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11169
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
25c09ca585e81bf9eb236a339ae5dcd64f63b679
divverent [Sun, 5 Jun 2011 14:55:40 +0000 (14:55 +0000)]
fix r_trippy compile with DRI/Mesa
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11180
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
af372e0fe5486d894987080a2a782bc78b6cf60a
divverent [Sat, 4 Jun 2011 20:06:13 +0000 (20:06 +0000)]
enable alpha test in dpsoftrast. Why was it turned off?
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11179
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
736fd14cf5a67635fcde41bb596acbc8f172a4d0
divverent [Sat, 4 Jun 2011 04:43:55 +0000 (04:43 +0000)]
add the new S_ function to snd_null.c too
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11178
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ee0301171ddfb3f95478ef1d2a2616db5f7153c4
divverent [Fri, 3 Jun 2011 20:18:37 +0000 (20:18 +0000)]
new cvars: snd_startloopingsounds, snd_startnonloopingsounds
Use cases:
1. playing mods with bugs where looping sounds never end, annoying
2. implementing demo seeking via cfg file tricks (turn off non-looping sounds
during high slowmo values used for seeking)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11177
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
55c3001cc18a0c55096bd3bb04af734df7e8025b
havoc [Fri, 3 Jun 2011 06:40:06 +0000 (06:40 +0000)]
check OpenGL 2.0 version again, rather than supporting fragment shaders
on 1.4, as it's just not performant on these chips and sometimes buggy
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11176
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d3179fa702631ed2c9b45ab21983365dce14def6
eihrul [Wed, 1 Jun 2011 11:56:46 +0000 (11:56 +0000)]
iqm version 1 compatibility
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11175
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ba7268e5279ee4f6959883a2789d5abdf8c67a70
eihrul [Tue, 31 May 2011 23:19:44 +0000 (23:19 +0000)]
support for version 2 of iqm
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11173
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e72b9d40a0b0bb4f55e3c280d6c2b9b412399ee1
eihrul [Tue, 31 May 2011 23:19:44 +0000 (23:19 +0000)]
UNMERGE! support for version 2 of iqm
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11173
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
e72b9d40a0b0bb4f55e3c280d6c2b9b412399ee1
divverent [Wed, 1 Jun 2011 10:47:42 +0000 (10:47 +0000)]
the git describe option --dirty is too new, so don't use it
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11174
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
04cb3d278b366b71d8a088acd2f5ffeb5ac4f448
eihrul [Tue, 31 May 2011 23:19:44 +0000 (23:19 +0000)]
support for version 2 of iqm
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11173
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e72b9d40a0b0bb4f55e3c280d6c2b9b412399ee1
divverent [Tue, 31 May 2011 20:25:01 +0000 (20:25 +0000)]
viewmodel matrix fixes:
- have two separate viewmodel matrices, one that only applies the viewmodel
scale (for EF_NOGUNBOB), and one that contains bobbing etc. effects
- recalculate both matrices properly when using R_SetView() from CSQC
- make sure view parameters are consistent between whether R_SetView() is
called or not
- fix missing viewmodel scale in intermission
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11172
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3f8dd70cf524fa42fafddb3dbc9aa64591c2d734
divverent [Sun, 29 May 2011 16:56:25 +0000 (16:56 +0000)]
fix calculation of viewangles to include v_idlescale
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11171
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6cc0a6e1e0bf9142cbbf9e5d93264d736fa342cf
havoc [Sun, 29 May 2011 11:06:42 +0000 (11:06 +0000)]
added r_trippy cvar
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11170
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9c19f5424cd24c82205885ed3d1c75f92f92b2d1
havoc [Sat, 28 May 2011 17:50:38 +0000 (17:50 +0000)]
reworked sv_gameplayfix_nudgeoutofsolid, it now begins with an enlarged
start position test and nudges out of solids, then does the move, this
should reduce collision issues with triangle mesh brushes in steelstorm,
renamed sv_gameplayfix_nudgeoutofsolid_bias to
sv_gameplayfix_nudgeoutofsolid_separation with 0.03125 as default
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11169
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
25c09ca585e81bf9eb236a339ae5dcd64f63b679
divverent [Fri, 27 May 2011 16:58:46 +0000 (16:58 +0000)]
call SetDllDirectory on Win32 too
Usage: put DLLs in a bin32/ subdir for that
If not done, binaries work as before.
This is the only way to have a 32bit and 64bit executable version in the same
directory! Otherwise Windows will abort DLL search at the 32bit DLL, which
fails to load into a 64bit process.
NOTE: this requires WinXP SP1 and above. To compile with this functionality
disabled, compile with -DDONT_USE_SETDLLDIRECTORY added to the CFLAGS.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11168
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fc8e8ca74dbb1cf8729e193ae25652daea9416a8
havoc [Fri, 27 May 2011 07:44:27 +0000 (07:44 +0000)]
apply vid_sRGB correction to viewblends and particles
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11167
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bebdddd7765df0b347089323bad3a5ae626f7822
havoc [Wed, 25 May 2011 01:46:42 +0000 (01:46 +0000)]
r_speeds now shows without being connected (in menu for example),
showfps also does
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11166
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
dcfd91cf606568faf86a1826496f9f86927c45af
havoc [Wed, 25 May 2011 01:13:13 +0000 (01:13 +0000)]
fix bugs with deformvertexes autosprite in GL11/GL13/GLES1 paths
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11165
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fb3d2ae44bef169636365338609174217fdf89cb
havoc [Mon, 23 May 2011 15:49:45 +0000 (15:49 +0000)]
honor ent->shadertime in all material handling (tcmod, etc)
do frame looping properly on q3 shader animmap (no more precision issues)
wrap tcmod scroll so that it does not have precision breakdown
changed rsurface.ent_shadertime to rsurface.shadertime which is now
relative time (what should be used)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11164
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
413d0b4aa169829f1c464b2bcde781972af138a2
havoc [Mon, 23 May 2011 15:46:32 +0000 (15:46 +0000)]
added LoopingFrameNumberFromDouble function to do this operation
correctly (using divide, floor, and multiply), since doing it the lazy
way (cast to int, use modulus operator) breaks down after a certain
amount of time in the level
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11163
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6bb2c4cecb8a4e633fc0faf90c939fc180f7163b
havoc [Mon, 23 May 2011 09:41:52 +0000 (09:41 +0000)]
fix a crash in debug builds where the compiler did not optimize
ch->sfx-> to use a local variable holding the unchanging value of sfx
(the crash occurs when the mixer thread clears ch->sfx while the main
thread is deciding whether to merge a sound onto an existing channel -
if the channel dies during this code, the sfx pointer must be preserved)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11161
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b812f1cdbdd266c770423017f47a129e64811cf0
havoc [Mon, 23 May 2011 11:08:46 +0000 (11:08 +0000)]
fix steelstorm animated shader timing (shadertime was not declared in
this csprogs.dat and the old code checked for that, no longer possible)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11162
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9ae45aa38830d74344ac5d7a959788a2d89b5a6f
vortex [Sat, 21 May 2011 16:59:30 +0000 (16:59 +0000)]
Move some sprite-related cvars to model_sprite.c.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11160
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8db36146f598c50f57d2f8dd60f69a64fe15e8d5
vortex [Fri, 20 May 2011 20:28:46 +0000 (20:28 +0000)]
add precache_cubemap() builtin
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11159
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
eceb4d03fd1de4078f3056fbde91ea55ffe5393d
vortex [Fri, 20 May 2011 20:27:10 +0000 (20:27 +0000)]
Added "loadcubemap" builtin to allow preload cubemaps level can use, added experimental "r_water_lowquality" which reduces options while rendering water planes, this can help a bit. Added "gl_texturecompression_sprites" cvar.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11158
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e08e20e6bfbd53bb1796e8de40d261bbfd0e7c3
havoc [Thu, 19 May 2011 01:33:42 +0000 (01:33 +0000)]
added JOY_UP/DOWN/LEFT/RIGHT keys which are a more general form of the joy_axiskeyevents cvar (which when set to 1 will turn these into UPARROW/DOWNARROW/etc as before, but this way a menu qc can respond to them correctly)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11157
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
db717d093453e95a1fc005d7c884b12562d7ca9f
havoc [Thu, 19 May 2011 01:21:10 +0000 (01:21 +0000)]
XInput code path no longer emulates arrow keys in menu by default, instead this is based purely on the joy_axiskeyevents cvar (and no longer cares if it is the menu or not)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11156
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d6070bce95a76039af1a5073b0fed22efab34bae
havoc [Wed, 18 May 2011 13:32:46 +0000 (13:32 +0000)]
disable VorteX's multisample setup code because it crashes vid_restart
and looks like it does not work anyway
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11155
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6551bfc9535e8b62c0c567500948d44b8da6acbe
havoc [Sat, 14 May 2011 17:58:56 +0000 (17:58 +0000)]
don't crash in dedicated server when parsing shaders with dpreflectcube
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11151
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e356fe45dd489969d894461876d1701bb02e79f9
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e272f5efe910b09242dd42c4044aa85bfe9b1710
havoc [Wed, 18 May 2011 13:18:43 +0000 (13:18 +0000)]
implemented support for Windows XInput (using different keys/cvars to allow non-conflicting configs) in vid_shared.c, usable in WGL and SDL clients on Windows
redesigned joystick code to encode any joystick data into a vid_joystate_t struct and use a common code path for all handling of axes and button events (also rewrote joy_axiskeyevents as part of this)
changed joystick deadzone handling to make values start at 0 at the edge of the deadzone
removed legacy joystick code in vid_wgl.c because it was too annoying to maintain
removed some hacky SDL 1.3 iOS code that is no longer needed
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11154
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5737591d891d69836735abb645a1b173baaabe96
havoc [Wed, 18 May 2011 13:08:01 +0000 (13:08 +0000)]
fix a bug where the wrong PRVM_ macro was being used
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11153
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2625b75211299dbaff3e97e4d864e3b67117048a
vortex [Fri, 13 May 2011 21:37:16 +0000 (21:37 +0000)]
UNMERGE! Multisampling initialisation moved from vid_sdl to gl_backend. Make cubemaps array dynamic (segments are allocated on load), this uses less memory, and MAX_CUBEMAPS was raised.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11147
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
e272f5efe910b09242dd42c4044aa85bfe9b1710