]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
havoc [Sat, 22 Oct 2011 00:01:07 +0000 (00:01 +0000)]
don't crash when .clientcamera is set on a botclient
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11457
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7397cf446562edf35f00217a2ed5fbac9be38c72
divverent [Sat, 22 Oct 2011 16:00:16 +0000 (16:00 +0000)]
fix factors in sRGBlightmaps code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11461
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e5a35dddf8d370d1d65cd86b67a788cb665f872
divverent [Sat, 22 Oct 2011 15:28:56 +0000 (15:28 +0000)]
fix image loading sRGB conversion
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11460
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a4dd8ae85c621f2d16ede4a0ebb41a3b34bcea9
divverent [Sat, 22 Oct 2011 15:08:47 +0000 (15:08 +0000)]
more sRGB simplification
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11459
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
31e8453b50c34dee486958821aea13401c7675b6
divverent [Sat, 22 Oct 2011 14:19:37 +0000 (14:19 +0000)]
a harmless sRGB simplification, more to be done later
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11458
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
154145cdd4e53712d7c69f1def94df479d4b7e34
divverent [Fri, 21 Oct 2011 11:09:48 +0000 (11:09 +0000)]
use the correct sRGB conversion for the gamma ramps
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11456
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a211e7328dfccde2ee4bc625cd84007335f0c3ce
divverent [Fri, 21 Oct 2011 10:23:12 +0000 (10:23 +0000)]
fix another typo in sRGB conversion
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11455
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
42c9a66eb6bc09e85ba90853758968ddd0678231
divverent [Fri, 21 Oct 2011 10:12:43 +0000 (10:12 +0000)]
make sRGB conversions match entirely with GL_EXT_texture_sRGB spec
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11454
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3f7c2dc6deafcfca2aadf029224435ff44725646
divverent [Wed, 19 Oct 2011 07:33:08 +0000 (07:33 +0000)]
fix a compile error in recent bloom changes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11445
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e85279d2ec63bc45263ed22105e20774a731182
divverent [Fri, 21 Oct 2011 09:59:59 +0000 (09:59 +0000)]
option: mod_q3bsp_sRGBlightmaps (experimental)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11453
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9ba6a695ba41b38380842038e01188490ca388b0
divverent [Fri, 21 Oct 2011 04:41:30 +0000 (04:41 +0000)]
vid_sRGB_fallback: now 3 is unconditional, and 2 also falls back if framebuffer is 8bit (I know this detection breaks when toggling r_viewfbo at runtime, don't care, people shall do vid_restart)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11452
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
be1e5756811400102d2d73ce685e6d6bb1397b96
divverent [Thu, 20 Oct 2011 17:40:37 +0000 (17:40 +0000)]
make the sRGB fallback cvar controlled (and off by default)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11451
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2a5f7fd6fcc9616626358aab8207a123cdad9018
divverent [Thu, 20 Oct 2011 17:40:36 +0000 (17:40 +0000)]
fix parts of the sRGB emulation
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11450
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9c3a68b2217df842dad217a52fd74cee522ddb05
divverent [Thu, 20 Oct 2011 17:40:34 +0000 (17:40 +0000)]
sRGB: also handle sRGB for loading DDS textures
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11449
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ac0a4ff6a9cfa171c51cb2a513617d4ae917e1be
divverent [Thu, 20 Oct 2011 17:40:31 +0000 (17:40 +0000)]
sRGB: also convert vertex colors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11448
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
526bfd4273b914ea2e47355251f6d932b19f6414
divverent [Thu, 20 Oct 2011 17:40:30 +0000 (17:40 +0000)]
rename the function
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11447
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ff3467b646bfe97304d9ae4170ae405cd1eff6a2
divverent [Thu, 20 Oct 2011 17:40:28 +0000 (17:40 +0000)]
convert lightmaps to sRGB for nice sRGB support
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11446
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b252f6823904f7cddfe55fb81b86aed8fed27204
eihrul [Tue, 18 Oct 2011 07:56:03 +0000 (07:56 +0000)]
make R_SetupView take view size from fbo textures if available
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11444
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
537e914e2ccc6de7b570baeee1cdf66bfd11afbc
eihrul [Tue, 18 Oct 2011 07:14:43 +0000 (07:14 +0000)]
fix fbo var name bug in R_DrawModelShadowMaps
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11443
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c9a6f2be8ed63432cc010bf59ba9f109b1202634
divverent [Tue, 18 Oct 2011 07:00:38 +0000 (07:00 +0000)]
fix one C++ compile error. It looks like we have no more wrong declaration of function issues, as C++ name mangling should have detected them.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11442
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bc33af16978d2aca67b4d0bf337bb35ebfff4a08
divverent [Tue, 18 Oct 2011 06:58:29 +0000 (06:58 +0000)]
move these declarations to where they belong
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11441
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9cafeb9c531eb97406f23fd19cb7cc989b4d331b
eihrul [Tue, 18 Oct 2011 06:52:23 +0000 (06:52 +0000)]
fix R_DrawModelShadows/R_DrawModelShadowMaps prototypes not matching definitions
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11440
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a4938742a2244e7b5153b3446925cf0878ce1711
havoc [Mon, 17 Oct 2011 17:00:10 +0000 (17:00 +0000)]
reworked collision cache to only be used by bouncegrid and only in
dynamic mode (static mode no longer causes several heart attacks in the
collision cache as it executes many times the regular amount of traces)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11436
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ab9e8a37699390a5dc199e4def9cdbaaa59d82cf
havoc [Mon, 17 Oct 2011 11:16:53 +0000 (11:16 +0000)]
init/shutdown thread system in dedicated server as well
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11434
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bf8764923af1ad07dcf066b796eace70dca9ae7f
divverent [Sun, 16 Oct 2011 14:17:50 +0000 (14:17 +0000)]
properly detect vid.samples value if overridden by driver
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11431
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
99273e68db25d6f8e325c90e0d89c1a3f1df0a03
havoc [Sun, 16 Oct 2011 13:50:53 +0000 (13:50 +0000)]
if vid_samples is > 1 then do not use fbo view or water renders
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11430
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0e0847b55300c06ea49db519a78cb8a27528ea8a
havoc [Sun, 16 Oct 2011 12:49:59 +0000 (12:49 +0000)]
fix motionblur with r_viewfbo 2 or 3
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11429
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3aa28fd7f2e07369fa604f33f6fc8ecba78989e
divverent [Sun, 16 Oct 2011 12:39:10 +0000 (12:39 +0000)]
for now, turn off FBO if multisampling as their combination is not implemented yet
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11428
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4dfe3710c36945df2d7de419207f05b6aa6a7ac4
havoc [Sun, 16 Oct 2011 09:57:08 +0000 (09:57 +0000)]
added r_water_fbo cvar to enable fbo rendering of water by default
regardless of r_viewfbo
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11427
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c8794d1a8f249133f880ec44919f2c2f4577d6e7
havoc [Sun, 16 Oct 2011 09:54:40 +0000 (09:54 +0000)]
removed cvars r_hdr and r_hdr_range - now the only way to get HDR
rendering is using r_viewfbo 2 (which is faster and nicer)
implemented fbo rendering for water, bloom and gamma, setting r_viewfbo
to 1 gives a consistent speed gain because it avoids all texture copies
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11426
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b641cdf4343692743e15b2427f183a92890e118f
havoc [Sun, 16 Oct 2011 09:38:54 +0000 (09:38 +0000)]
overhauling a lot of functions to allow fbo rendering
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11425
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e36d3ccde0581e22d4b96214247bb8f98b6bca6
havoc [Sun, 16 Oct 2011 09:11:52 +0000 (09:11 +0000)]
renamed r_bloomstate to r_fb because it contains framebuffer settings
moved r_waterstate to r_fb.water
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11424
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9fb392ea7f82bb41cfb866837cc9e9cade57eb4b
havoc [Mon, 17 Oct 2011 17:19:28 +0000 (17:19 +0000)]
fix more crashes to do with animscenes being NULL on some models,
audited all the isanimated lines
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11439
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
badaa9e2623b5a0b1a32808c77fe9a08970c9e16
havoc [Mon, 17 Oct 2011 17:07:41 +0000 (17:07 +0000)]
added sv_disablenotify cvar (default 1) to suppress prints about
CVAR_NOTIFY cvars changing
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11438
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8cabb44fef43e034df597cf69427d444203f3719
havoc [Mon, 17 Oct 2011 12:02:53 +0000 (12:02 +0000)]
allow terminal input on sdl client as well (glx client already does)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11435
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1d608e129d8e8d2bd1e5c5266f91b210d187fabd
divverent [Mon, 17 Oct 2011 11:07:20 +0000 (11:07 +0000)]
new cvar: cl_maxphysicsframesperserverframe
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11433
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f4a6d512d8e7d386cab7f1e9de98512ccf3e6e6b
havoc [Sun, 16 Oct 2011 18:26:06 +0000 (18:26 +0000)]
fix byte color handling in iqm loader
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11432
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c8eeae0e243fac0e352d2d99ca8fdccc734c86df
havoc [Sun, 16 Oct 2011 08:55:06 +0000 (08:55 +0000)]
oops, missed this
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11423
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f5683ff1ec58b10a8a8602628ae3422eab492c72
havoc [Sun, 16 Oct 2011 08:50:13 +0000 (08:50 +0000)]
added cvar r_water_hideplayer with 3 possible values (can hide from
nothing, refraction, or refraction and reflection)
renamed r_waterstate.renderingrefraction to r_waterstate.hideplayer
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11422
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
331e31efc820e28ca6bbc089ffe33d78962fbfe3
havoc [Sat, 15 Oct 2011 00:19:54 +0000 (00:19 +0000)]
fix two crashes that divVerent found and fixed but didn't commit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11419
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ed0e9df6813f346647e54f92043920f63c1151b1
havoc [Fri, 14 Oct 2011 08:28:45 +0000 (08:28 +0000)]
fix crashes with last patch to model loaders
load vertex colors in iqm model format if they exist (can be accessed in
GLSL Shaders)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11405
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b081b91727d6a51377d07c83245f8a22bac3755c
havoc [Fri, 14 Oct 2011 06:18:08 +0000 (06:18 +0000)]
allow iqm models without geometry
allow iqm models without animation
compute model->surfmesh.isanimated and model->AnimateVertices in a
better way to make sure static models are identified as such (if bones
is 0 or 1, and no animation frames, treat as static)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11404
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
90e7a69e22ff2bb2dd087ca5d9c0fa8132db4794
divverent [Sat, 15 Oct 2011 21:07:33 +0000 (21:07 +0000)]
curl: change how failure/success is decided to prevent "black screen" problems if an unrelated download 404s
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11421
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
416a6242fb6d9e6676da2ff28d6b33478f84d3fe
havoc [Sat, 15 Oct 2011 01:53:30 +0000 (01:53 +0000)]
fix crashes in viewthing code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11420
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
568a2a0afda742673ebd8cbce2eeded1ac70a10a
divverent [Fri, 14 Oct 2011 18:59:57 +0000 (18:59 +0000)]
fix warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11418
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3f9f3e395065f16028f1ce7748f703c1afc0da6f
divverent [Fri, 14 Oct 2011 18:59:55 +0000 (18:59 +0000)]
add missing fabs
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11417
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
79752d8b393b5d7935c97919cf0963d5c760d5f1
divverent [Fri, 14 Oct 2011 18:53:03 +0000 (18:53 +0000)]
fix decay calculation in snd_softclip
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11416
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2b6658ae80858652e17ad3489e4bf5df6a7b8106
divverent [Fri, 14 Oct 2011 18:48:59 +0000 (18:48 +0000)]
snd_maxchannelvolume and snd_softclip
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11415
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ba3466519160011c7d9487be0fa33ca86de26e92
divverent [Fri, 14 Oct 2011 17:41:41 +0000 (17:41 +0000)]
also support ReplayGain if peak is not defined
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11414
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
db154618b001c5ec3403f09b5a2142d6f972785e
havoc [Fri, 14 Oct 2011 14:47:22 +0000 (14:47 +0000)]
removed OffscreenGecko support because it is not maintained
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11413
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
97925bafa9abb1dc0a889aba11c9f442a139d8dd
havoc [Fri, 14 Oct 2011 14:39:55 +0000 (14:39 +0000)]
removed scr_zoomwindow feature to simplify code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11412
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
09a24927b4fc5fa83a34cac761ae6962f5c8369e
havoc [Fri, 14 Oct 2011 14:34:03 +0000 (14:34 +0000)]
fix bugs with CSQC clearscene function - it now restores the view to
what was given to CSQC_UpdateView in the first place
fix bugs with getpropertyvec(VF_FOV) - it reads view.ortho_x and y
values assuming they are the original angles, so these needed to be set
correctly by the engine before invoking CSQC_UpdateView
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11410
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e8054fa0316150c3fdb748a66228ab7f9fcdeccb
havoc [Fri, 14 Oct 2011 13:11:14 +0000 (13:11 +0000)]
added getproperty and getpropertyvec
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11409
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
acfed5e0361917f332322756bc09a23f5c59bf06
havoc [Fri, 14 Oct 2011 09:52:32 +0000 (09:52 +0000)]
use PRVM_serverfunction when looking up SV_ChangeTeam,
not PRVM_clientfunction (harmless but stupid)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11407
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ce866fba439c8d4df9d4f0cc9f9fb8d1e5937351
havoc [Wed, 12 Oct 2011 12:10:26 +0000 (12:10 +0000)]
moved surface culling code to a separate function, added a call to it in
the custompvs case (for water rendering), should be a good speedup
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11403
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
07ac14430fcaa099872e35adb73dbc0f97278154
havoc [Wed, 12 Oct 2011 10:16:57 +0000 (10:16 +0000)]
added sv_areadebug cvar which disables the use of the areagrid (VERY bad
for performance, use ONLY for testing collision bugs)
added a small padding value (1 unit) to areagrid queries
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11402
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bb74c5a48f2b4962b8f343bf7c0187fac67c1ac1
havoc [Wed, 12 Oct 2011 10:14:02 +0000 (10:14 +0000)]
added r_hdr_irisadaptation_radius which determines the area being
sampled for lighting to choose a scene brightness... still a lousy
effect though
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11401
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
18dc7986429885c94955dca30a4be0006a24b139
havoc [Wed, 12 Oct 2011 10:13:17 +0000 (10:13 +0000)]
display scene brightness (r_refdef.view.colorscale) in r_speeds
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11400
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
08fd600ff992e233dff79c1543646f2a4f096d43
havoc [Wed, 12 Oct 2011 08:18:30 +0000 (08:18 +0000)]
removed S_StartSound_StartPosition function because it was unnecessary
make sure flags is passed correctly to CL_VM_Event_Sound and
S_StartSound_StartPosition_Flags
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11399
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7e9b839d38ceab7b7b02b6ed7cbb9f10334acd0b
havoc [Wed, 12 Oct 2011 08:15:00 +0000 (08:15 +0000)]
added cvar sv_gameplayfix_bugfixedcheckwatertransition to allow the
contents bugfixes to be disabled if desired, improved contents handling
to prevent a splash sound on spawn
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11398
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
276774e916493020226779229db91d4f7dc6fc06
divverent [Mon, 10 Oct 2011 10:24:53 +0000 (10:24 +0000)]
cl_movement: hit CSQC entities if solid (rationale: if you don't want this in your mod, don't make the ents solid, virtually nothing else cares for that!); the TracePoint calls used for checking if you are in water are NOT changed by this, as they also do not hit networkplayers and CSQC may have solid network players
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11397
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
70da4b9c6dd36d17b055cfa8ca1d89e6121fb08d
divverent [Sun, 9 Oct 2011 13:37:43 +0000 (13:37 +0000)]
add cvars: snd_attenuation_exponent, snd_attenuation_decibel
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11396
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4134bf6102c7d2c50c55658757a7e43cee244cb3
divverent [Sun, 9 Oct 2011 12:29:49 +0000 (12:29 +0000)]
improve logic for silent sound cutoff based on output buffer width
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11395
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
65568afe2573b7ceeb403d2ad697ccd3b6e0a188
divverent [Sat, 8 Oct 2011 18:12:33 +0000 (18:12 +0000)]
add a TODO comment about sound falloff curve, needs research
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11394
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f400985e6de180cce8374bcc3eecdfa1a28844ca
divverent [Sat, 8 Oct 2011 17:57:23 +0000 (17:57 +0000)]
sound mixing: PROPERLY detect silent sounds. Old code would cut off sounds at -15dB already.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11393
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
12849b354eaba65efdaad7277863f6b0f036bb38
divverent [Tue, 4 Oct 2011 07:42:50 +0000 (07:42 +0000)]
if the two mtimes are identical, also use the max interval as it's better to have this randomization than to have none
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11391
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bdbc7672b5ef00f204f341c95a601f5e71e9e8e0
divverent [Tue, 4 Oct 2011 07:35:39 +0000 (07:35 +0000)]
by default, skip start of the sound, don't delay (to match Quake)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11390
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0a4988964ea439b249f995a6fdc60fb19d108ff3
divverent [Tue, 4 Oct 2011 07:35:35 +0000 (07:35 +0000)]
provide cvars to change identical sound randomization
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11389
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
15340425159ae92f0152468c3ce694d0573da2bc
divverent [Tue, 4 Oct 2011 07:35:30 +0000 (07:35 +0000)]
sound: when randomizing sound start times, check pitch (base speed) too
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11388
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6d2396afcbd2468777f372c680af9a3b679d44a0
divverent [Tue, 4 Oct 2011 11:24:07 +0000 (11:24 +0000)]
server list: allow more AND and OR masks (except in DP_SMALLMEMORY profile)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11392
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
691ac0330045dfcf51fda91fc7704e5fb56b3173
divverent [Sun, 2 Oct 2011 09:37:48 +0000 (09:37 +0000)]
fix warnings I caused in a previous commit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11385
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a4e4ff088918c1516aac7af4c56e08e8b99f8954
divverent [Sat, 1 Oct 2011 15:04:36 +0000 (15:04 +0000)]
fix broken English
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11384
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
df5eb492ae79c0eb2fe4357db00e8a5129b026f6
eihrul [Sat, 1 Oct 2011 02:01:07 +0000 (02:01 +0000)]
fix crash when compiling shadowmaps for certain Q3BSP files with no faces
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11379
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e86ad109f5b381e160458c049bd9351800ccb32f
eihrul [Fri, 30 Sep 2011 14:05:06 +0000 (14:05 +0000)]
better fix for skeletal no-bones case
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11377
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d67118fd26deb0852127704246098681e0ac5399
eihrul [Fri, 30 Sep 2011 14:00:19 +0000 (14:00 +0000)]
handle no-bones case for skeletal animation
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11376
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
729abe44a989e71b183310919dd31fc1ee3aed63
divverent [Sat, 1 Oct 2011 13:29:16 +0000 (13:29 +0000)]
implement digest_hex()
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11382
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
853f7fe77fd4e7a79e682cf964e4ad863a1a60e7
divverent [Sat, 1 Oct 2011 13:29:14 +0000 (13:29 +0000)]
document DP_QC_DIGEST
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11381
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
40ef58498208a4e8df3bba2dd1d7073beca896a7
divverent [Sat, 1 Oct 2011 13:29:12 +0000 (13:29 +0000)]
move crc16()
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11380
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a747d4e88464cf86f98889e166b3a2f87679487
divverent [Fri, 30 Sep 2011 15:02:30 +0000 (15:02 +0000)]
oops, I hadn't document DP_QC_I18N back then... sorry for that
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11378
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
624cb2929567b86701d29ff51d55cba7b74d86fc
havoc [Mon, 26 Sep 2011 23:19:55 +0000 (23:19 +0000)]
Mac:
changed name from Darkplaces to DarkPlaces for consistency
changed launch script filename from darkplaces-sdl to darkplaces-osx-sdl
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11372
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f95dff21595df7f7a7672dd6abe43e4dc8098118
havoc [Mon, 26 Sep 2011 20:50:29 +0000 (20:50 +0000)]
detect if items2 field was declared in the quakec rather than checking
if GAME_HIPNOTIC or GAME_ROGUE because that prevented existing quake
server mods from abusing the runes on the quake hud
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11371
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b4b94ef8c28c401fc4164688438aac71fdf31c04
divverent [Sat, 1 Oct 2011 14:08:36 +0000 (14:08 +0000)]
CSQC_Event_Sound: pass pitch shift info; actually apply received pitch shift data
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11383
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c88063697a4bbe0021c5b24938579136ba35e277
havoc [Wed, 28 Sep 2011 05:05:35 +0000 (05:05 +0000)]
round the pitchchange setting to the nearest value
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11375
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
56619d1466eae24fdfc16a47dfbdbb1dd15c36ee
havoc [Wed, 28 Sep 2011 04:46:59 +0000 (04:46 +0000)]
fix another bug with sound pitchspeed parameter
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11374
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
008c637a3976f0514406779744051b31f41dc768
havoc [Wed, 28 Sep 2011 04:43:41 +0000 (04:43 +0000)]
write SND_SPEEDUSHORT4000 correctly
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11373
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
87f75abf945db568a72881a8cb32073f940d0b79
havoc [Mon, 26 Sep 2011 16:00:20 +0000 (16:00 +0000)]
fix two warnings (both were bad but unlikely to cause issues)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11370
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
119cbafe56ebbac24781cd5526d200e443327267
divverent [Sat, 24 Sep 2011 15:37:28 +0000 (15:37 +0000)]
export DP_SND_SOUND7_WIP2 (pitch shifting) to checkextension
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11367
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
69c7e4df933cc532b149b38bf1c00be6ab64a6a2
divverent [Mon, 19 Sep 2011 11:52:52 +0000 (11:52 +0000)]
video capture: add the missing 32768.0f factor
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11363
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
167d174d353c234a4f965a0bc1e4478e1a5cff86
havoc [Fri, 16 Sep 2011 08:56:11 +0000 (08:56 +0000)]
added network protocol for sound speed
(ushort speed*4000, not compatible with FTEQW, different flag)
added optional pitchchange parameter to pointsound
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11355
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3579ea0a97797b72298e63b723b65e46ea264b14
havoc [Fri, 16 Sep 2011 08:19:12 +0000 (08:19 +0000)]
fixed multiple crashes and infinite loops in sound mixer
reworked channel delay (negative position) to work properly
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11354
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d753608b3258d9713df8b2720d808da22b1442aa
divverent [Fri, 16 Sep 2011 04:47:01 +0000 (04:47 +0000)]
CSQC: support the sound pitch shift arg (NOT in SVQC yet)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11353
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c9555eb003ce4836557a3b3c50871359cdd971c6
havoc [Thu, 15 Sep 2011 19:12:19 +0000 (19:12 +0000)]
sound mixer now operates on floating point, has on-the-fly resampling
(allows features like pitch shifting, and potentially doppler), and the
ogg and modplug streaming code has been largely rewritten, much cleaner
now, this saves about 4MB of ram when playing quake content at default
settings (by not resampling the wav data to 48khz anymore), snd_speed
changes will now apply to next vid_restart (tested at 48, 96, 192khz)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11352
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ff0e0fd9ea6ce001e9c2c6f9e18ecda6aef15d10
vortex [Sat, 24 Sep 2011 15:35:49 +0000 (15:35 +0000)]
CSQC Getlight - added globals:
vector getlight_dir;
vector getlight_ambient;
vector getlight_diffuse;
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11366
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3f7c1a09ec02a66eb2c8f2e56c3333fcd8b86811
divverent [Mon, 26 Sep 2011 04:56:31 +0000 (04:56 +0000)]
DDS: properly count miplevels for 1x1 textures too when DDS saving
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11369
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1822e28ce6572e787ed2c3b78de1619e231d2eff
vortex [Sun, 25 Sep 2011 02:08:56 +0000 (02:08 +0000)]
DP_PHYSICS_ODE: new SOLID_PHYSICS_CYLINDER. New "massofs" vector field (shifts center-of-mass from model center, replaces default 'center of mins/maxs' approach). New "friction" field. Contact friction = cvar:physics_ode_contact_mu * object1.friction * object2.friction.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11368
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
61f44ced2c1db2784bcdb2fe4151fc6f5342248a
havoc [Fri, 23 Sep 2011 16:43:52 +0000 (16:43 +0000)]
if MATERIALFLAG_CUSTOMBLEND, clear MATERIALFLAG_ADD and
MATERIALFLAG_ALPHA, to prevent bugs where code checks those flags
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11365
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
48ccfb68d06fc2f6565ab6c34a0b17fae5393563
havoc [Sun, 18 Sep 2011 02:45:26 +0000 (02:45 +0000)]
fix watershader on entities
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11361
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5123996e8dbc654bb2401492d43205b6b2112ac5
havoc [Sat, 17 Sep 2011 03:23:29 +0000 (03:23 +0000)]
avoid crashes on watershader surfaces in models that are off-screen (yet
somehow marked visible)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11360
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3da7c5e3f841fb6bbe2fdaf85a1e3db7d312232
havoc [Fri, 16 Sep 2011 11:16:59 +0000 (11:16 +0000)]
tighten the tolerances on water plane merging
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11359
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
312e474b1be3555df31be8f8cdcdc1c6ce55a33c
havoc [Fri, 16 Sep 2011 11:09:13 +0000 (11:09 +0000)]
transform surface vertices to worldspace before calculating waterplane
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11358
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e30cc3765421b9eb971085dc809150ead69490c0