]> git.xonotic.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
11 years agochanged Q1BSP traceline to only use the surface-hitting variant if
havoc [Sun, 17 Feb 2013 05:05:28 +0000 (05:05 +0000)]
changed Q1BSP traceline to only use the surface-hitting variant if
sv_gameplayfix_q1bsptracelinereportstexture is on, because in one of
negke's maps a set of items are crushed by a pusher and are expected to
fall through the sky brush they are sitting on, which does not happen if
the sky surface is considered solid, but in any other situation this
should be reported as solid

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

11 years agoadded missing VS2010 projects
havoc [Fri, 15 Feb 2013 20:51:04 +0000 (20:51 +0000)]
added missing VS2010 projects

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

11 years agoadded props files for vs2010 and vs2012, changed name of darkplaces-2010.sln to darkp...
havoc [Thu, 7 Feb 2013 14:22:17 +0000 (14:22 +0000)]
added props files for vs2010 and vs2012, changed name of darkplaces-2010.sln to darkplaces-vs2010.sln and renamed the vcproj files similarly to darkplaces-sdl-vs2010.vcxproj and such.

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

11 years agoadded MSVC 2012 projects
havoc [Thu, 7 Feb 2013 13:36:55 +0000 (13:36 +0000)]
added MSVC 2012 projects

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

11 years agoadded MSVC++ 2010 projects
havoc [Thu, 7 Feb 2013 13:00:33 +0000 (13:00 +0000)]
added MSVC++ 2010 projects

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

11 years agofix a sizeof using an array index variable that is never initialized (harmless but...
havoc [Thu, 7 Feb 2013 12:59:53 +0000 (12:59 +0000)]
fix a sizeof using an array index variable that is never initialized (harmless but the variable is unused by actual code and thus causes a warning)
declare macros for ID3DXBuffer_ functions because they were removed in a DX SDK update

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

11 years agofix another C++ compile error
havoc [Thu, 7 Feb 2013 12:06:40 +0000 (12:06 +0000)]
fix another C++ compile error

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

11 years agofix a Mem_Alloc call that needs a type cast in C++
havoc [Thu, 7 Feb 2013 11:42:21 +0000 (11:42 +0000)]
fix a Mem_Alloc call that needs a type cast in C++

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

11 years agochanged format of builtin shader strings to use comma separated lines,
havoc [Thu, 7 Feb 2013 11:40:40 +0000 (11:40 +0000)]
changed format of builtin shader strings to use comma separated lines,
this should fix compilation on MSVC where default.glsl exceeded 65535
character limit
removed MODE_SHOWDEPTH from shaders and code because it is not used and
is not likely to ever be used anyway
reworked shadermodeinfo_t to only have one filename rather than separate
filenames for vertex and fragment shader
reworked r_glsl_dumpshader to cope with multiple shader filenames and
unified some code for glsl and hlsl text processing

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

11 years agoremove unused macro
eihrul [Thu, 7 Feb 2013 11:16:38 +0000 (11:16 +0000)]
remove unused macro

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

11 years agor_showsurfaces + r_glsl_skeletal doesn't work currently, so blacklist the combination...
divverent [Fri, 25 Jan 2013 19:59:31 +0000 (19:59 +0000)]
r_showsurfaces + r_glsl_skeletal doesn't work currently, so blacklist the combination for now

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

11 years agoskel_build: fix wrong 4th matrix row of skeleton matrices
divverent [Wed, 23 Jan 2013 12:52:13 +0000 (12:52 +0000)]
skel_build: fix wrong 4th matrix row of skeleton matrices

Matrix4x4_Scale doesn't affect the 4th row, but Matrix4x4_Accumulate
does, leading to wrong result. This broke weapon to player attachment
when the player has a skeletonobject.

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

11 years agofix r_depthfirst 2 with r_glsl_skeletal 1
divverent [Tue, 22 Jan 2013 11:28:19 +0000 (11:28 +0000)]
fix r_depthfirst 2 with r_glsl_skeletal 1

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

11 years agoFix typos in GPU skeletal; explain the crossproduct hack
divverent [Sun, 20 Jan 2013 21:11:58 +0000 (21:11 +0000)]
Fix typos in GPU skeletal; explain the crossproduct hack

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

11 years agoimplemented a fallback case for r_glsl_skeletal 1 when dynamicvertex
havoc [Wed, 16 Jan 2013 16:54:25 +0000 (16:54 +0000)]
implemented a fallback case for r_glsl_skeletal 1 when dynamicvertex
occurs (the batch code will apply the skeletal deforms to the batch, to
ensure proper functionality with deformvertexes and such)
added r_batch_debugdynamicvertexpath cvar which is useful for debugging
skeletal fallback issues

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

11 years agoimplemented gpu-skinning (vertex shader skeletal animation), can be
havoc [Wed, 16 Jan 2013 14:23:31 +0000 (14:23 +0000)]
implemented gpu-skinning (vertex shader skeletal animation), can be
disabled by turning off the r_glsl_skeletal cvar

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

11 years agomake MUL_VF and MUL_FV friendlier for compilers, and fix segfaul in LOAD_V
divverent [Sun, 13 Jan 2013 20:12:03 +0000 (20:12 +0000)]
make MUL_VF and MUL_FV friendlier for compilers, and fix segfaul in LOAD_V

From: Wolfgang Bumiller <blub@speed.at>

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

11 years agocast to etype_t to avoid g++ compiler errors
havoc [Sat, 12 Jan 2013 01:50:07 +0000 (01:50 +0000)]
cast to etype_t to avoid g++ compiler errors

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

11 years agofix a typo in the watchpoints code that warns
divverent [Thu, 10 Jan 2013 10:24:33 +0000 (10:24 +0000)]
fix a typo in the watchpoints code that warns

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

11 years agopatch from roboman2444 :
havoc [Thu, 10 Jan 2013 02:58:16 +0000 (02:58 +0000)]
patch from roboman2444 :
new cvar cl_capturevideo_demo_stop which makes video capture automatically
end when demo playback ends

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

11 years agoMake watchpoints data type aware; now vector watchpoints work too.
divverent [Wed, 9 Jan 2013 12:19:15 +0000 (12:19 +0000)]
Make watchpoints data type aware; now vector watchpoints work too.

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

11 years agoBreakpoints and watchpoints
divverent [Tue, 8 Jan 2013 12:37:43 +0000 (12:37 +0000)]
Breakpoints and watchpoints

"Break" on statement: prvm_breakpoint server 12345
"Break" on function: prvm_breakpoint server ClientConnect
Watch for global change: prvm_globalwatchpoint server time
Watch for entity field change: prvm_edictwatchpoint server 1 health

There can be only one of each kind. To clear, do:

prvm_breakpoint server
prvm_globalwatchpoint server
prvm_edictwatchpoint server

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

11 years agoreworked some code for BATCHNEED_NOGAPS to be more consistent and made
havoc [Tue, 8 Jan 2013 12:29:24 +0000 (12:29 +0000)]
reworked some code for BATCHNEED_NOGAPS to be more consistent and made
the comments more clear about its behavior (firstvertex is 0, no gaps),
no longer using BATCHNEED_NOGAPS in a couple places

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

11 years agoflag a few more things (depth-only draws, shadowmap draws) as allowing
havoc [Tue, 8 Jan 2013 11:19:58 +0000 (11:19 +0000)]
flag a few more things (depth-only draws, shadowmap draws) as allowing
r_batch_multidraw to work

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

11 years agoadded r_batch_multidraw and r_batch_multidraw_mintriangles cvars, this
havoc [Tue, 8 Jan 2013 10:56:58 +0000 (10:56 +0000)]
added r_batch_multidraw and r_batch_multidraw_mintriangles cvars, this
code defaults on, restoring the old rendering path that used multiple
glDrawRangeElements calls for surface batching rather than copying index
data, on high poly maps this has a positive impact, on low poly maps I
was unable to find a difference in fps either way

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

11 years agoserver: ignore out of order prespawn/spawn/begin commands
divverent [Wed, 2 Jan 2013 08:27:19 +0000 (08:27 +0000)]
server: ignore out of order prespawn/spawn/begin commands

This fixes disconnection issues for clients joining during map change.

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

11 years agoslightly speed up vid_glx by better XShm handling
divverent [Mon, 31 Dec 2012 19:10:23 +0000 (19:10 +0000)]
slightly speed up vid_glx by better XShm handling

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

11 years agoallow framebuffer objects to be used where non-power of two textures are not required
eihrul [Tue, 25 Dec 2012 01:26:12 +0000 (01:26 +0000)]
allow framebuffer objects to be used where non-power of two textures are not required

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

11 years agofixed coronas not being rendered with MATERIALFLAG_NODEPTHTEST
havoc [Sat, 22 Dec 2012 10:32:38 +0000 (10:32 +0000)]
fixed coronas not being rendered with MATERIALFLAG_NODEPTHTEST

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

11 years agofix bug with transparency sorting introduced by vortex in r11822 where
havoc [Sat, 22 Dec 2012 07:49:40 +0000 (07:49 +0000)]
fix bug with transparency sorting introduced by vortex in r11822 where
.transparentsort was not initialized in a lot of materials, which meant
TRANSPARENTSORT_SKY was used rather than TRANSPARENTSORT_DISTANCE

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

11 years agoadded GAME_QUOTH to use the hipnotic hud and workarounds with the quoth
havoc [Sat, 22 Dec 2012 06:19:30 +0000 (06:19 +0000)]
added GAME_QUOTH to use the hipnotic hud and workarounds with the quoth
folder instead of hipnotic

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

11 years agoremoved GAME_SOM as this game was never finished or released
havoc [Sat, 22 Dec 2012 04:35:03 +0000 (04:35 +0000)]
removed GAME_SOM as this game was never finished or released

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

11 years agodon't set r_hdr in the menu presets for lighting quality, the cvar has
havoc [Sat, 22 Dec 2012 04:07:06 +0000 (04:07 +0000)]
don't set r_hdr in the menu presets for lighting quality, the cvar has
been removed

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

11 years agouse LNO files for backtraces (by Blub)
divverent [Thu, 20 Dec 2012 11:37:38 +0000 (11:37 +0000)]
use LNO files for backtraces (by Blub)

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

11 years agoproperly use the D3DX C interface
divverent [Thu, 20 Dec 2012 11:05:54 +0000 (11:05 +0000)]
properly use the D3DX C interface

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

11 years agoonly include SDL_syswm.h if really necessary
divverent [Thu, 20 Dec 2012 11:05:48 +0000 (11:05 +0000)]
only include SDL_syswm.h if really necessary

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

11 years agoonly include SDL_syswm.h if really necessary
Rudolf Polzer [Mon, 17 Dec 2012 09:53:20 +0000 (10:53 +0100)]
only include SDL_syswm.h if really necessary
::stable-branch::merge=b0050acadb01e7e98de898ed66153325e81b0018

11 years agoskel_build: normalize the per-bone matrices
divverent [Thu, 13 Dec 2012 14:44:12 +0000 (14:44 +0000)]
skel_build: normalize the per-bone matrices

Looks a lot better if animations are "mismatched" in some evil ways.

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

11 years agoadditional high quality shadowmap filter that uses the shadow sampler rather than...
eihrul [Sat, 8 Dec 2012 02:31:28 +0000 (02:31 +0000)]
additional high quality shadowmap filter that uses the shadow sampler rather than texture gathers

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

11 years agofaster shadowmap sampler filter
eihrul [Sat, 1 Dec 2012 13:08:38 +0000 (13:08 +0000)]
faster shadowmap sampler filter

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

11 years agosilence more warnings
eihrul [Sat, 1 Dec 2012 13:04:49 +0000 (13:04 +0000)]
silence more warnings

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

11 years agosilence some warnings
eihrul [Sat, 1 Dec 2012 12:58:17 +0000 (12:58 +0000)]
silence some warnings

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

11 years agoensure shadowing quality keeps track of r_fb.usedepthtextures
eihrul [Sat, 29 Sep 2012 07:20:13 +0000 (07:20 +0000)]
ensure shadowing quality keeps track of r_fb.usedepthtextures

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

11 years agofix rcon crash
divverent [Thu, 27 Sep 2012 10:25:09 +0000 (10:25 +0000)]
fix rcon crash

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

11 years agouse library versions 2 and 3 of ODE too. It seems compatible.
divverent [Wed, 26 Sep 2012 12:48:42 +0000 (12:48 +0000)]
use library versions 2 and 3 of ODE too. It seems compatible.

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

11 years agosupport DP_QC_ENTITYDATA in menuqc too
divverent [Wed, 26 Sep 2012 07:35:01 +0000 (07:35 +0000)]
support DP_QC_ENTITYDATA in menuqc too

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

11 years agoscr_loadingscreen_background: fix double-applied gamma.
vortex [Sun, 23 Sep 2012 09:42:43 +0000 (09:42 +0000)]
scr_loadingscreen_background: fix double-applied gamma.

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

11 years agoadd a cast to fix compile error
divverent [Thu, 20 Sep 2012 09:26:48 +0000 (09:26 +0000)]
add a cast to fix compile error

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

11 years agobuffer csprogs downloads and load csprogs from the buffer instead of a file, if available
divverent [Wed, 19 Sep 2012 15:13:14 +0000 (15:13 +0000)]
buffer csprogs downloads and load csprogs from the buffer instead of a file, if available

This fixes csprogs-from-demo loading if dlcache is not writable

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

11 years agocl_loadingscreen_fps: fix it on Linux
divverent [Wed, 19 Sep 2012 10:22:05 +0000 (10:22 +0000)]
cl_loadingscreen_fps: fix it on Linux

Sys_DirtyTime returns double, float doesn't have enough accuracy to hold
a gettimeofday() result, which caused VERY seldom loading screen updates

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

11 years agoNew cvar scr_loadingscreen_maxfps (default 10) which restricts maximum number of...
vortex [Thu, 9 Aug 2012 18:38:54 +0000 (18:38 +0000)]
New cvar scr_loadingscreen_maxfps (default 10) which restricts maximum number of loading screen updates per second. This will halve loading times of quake maps with vid_vsync 1 as it really spends more time on drawing loading screen than on actual loading there.

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

11 years agoUNMERGE! New cvar scr_loadingscreen_maxfps (default 10) which restricts maximum numbe...
vortex [Thu, 9 Aug 2012 18:38:54 +0000 (18:38 +0000)]
UNMERGE! New cvar scr_loadingscreen_maxfps (default 10) which restricts maximum number of loading screen updates per second. This will halve loading times of quake maps with vid_vsync 1 as it really spends more time on drawing loading screen than on actual loading there.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11840 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=ac6244346ed7754e5d178393cb5116ecc7cefe16

11 years agoturn off session locking if running -readonly
divverent [Wed, 19 Sep 2012 10:02:57 +0000 (10:02 +0000)]
turn off session locking if running -readonly

because locking obviously fails when readonly

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

11 years agocommand line option -readonly to turn off all writing
divverent [Tue, 18 Sep 2012 11:57:22 +0000 (11:57 +0000)]
command line option -readonly to turn off all writing

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

11 years agoNew cvar r_shadows_shadowmapbias to customize bias of fake shadows. Default is -1...
vortex [Mon, 17 Sep 2012 13:58:17 +0000 (13:58 +0000)]
New cvar r_shadows_shadowmapbias to customize bias of fake shadows. Default is -1 - use r_shadow_shadowmapping_bias.

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

11 years agoupgrade some memory formats to unsigned int from unsigned short for BSP2
havoc [Fri, 7 Sep 2012 05:28:06 +0000 (05:28 +0000)]
upgrade some memory formats to unsigned int from unsigned short for BSP2
maps

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

11 years agospecial character translation: don't generate control characters from non-control...
divverent [Thu, 6 Sep 2012 18:43:49 +0000 (18:43 +0000)]
special character translation: don't generate control characters from non-control characters!

qfont_table entry 10 e.g. causes U+E00A to be turned into a newline. DO NOT WANT.

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

11 years agoNew cvar scr_loadingscreen_picture to customize loading pic.
vortex [Sat, 1 Sep 2012 01:46:04 +0000 (01:46 +0000)]
New cvar scr_loadingscreen_picture to customize loading pic.
GAME_BLOODOMNICIDE: allow to load low quality version pics (ones used to get sizes) from locale/.

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

11 years agoNew cvar scr_loadingscreen_maxfps (default 10) which restricts maximum number of...
vortex [Thu, 9 Aug 2012 18:38:54 +0000 (18:38 +0000)]
New cvar scr_loadingscreen_maxfps (default 10) which restricts maximum number of loading screen updates per second. This will halve loading times of quake maps with vid_vsync 1 as it really spends more time on drawing loading screen than on actual loading there.

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

11 years agorelax PRVM_EDICT_NUM error checking on saving a savegame so that
havoc [Sun, 5 Aug 2012 23:24:06 +0000 (23:24 +0000)]
relax PRVM_EDICT_NUM error checking on saving a savegame so that
honey.bsp can save game

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

11 years agofix some compile errors and warnings with USE_GLES2
havoc [Wed, 1 Aug 2012 05:30:31 +0000 (05:30 +0000)]
fix some compile errors and warnings with USE_GLES2

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

11 years agogl_lightmaps: value of 2 keeps normalmaps.
vortex [Sat, 28 Jul 2012 20:18:26 +0000 (20:18 +0000)]
gl_lightmaps: value of 2 keeps normalmaps.

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

11 years agoslightly cheaper linear PCF sequence
eihrul [Sun, 20 May 2012 14:24:52 +0000 (14:24 +0000)]
slightly cheaper linear PCF sequence

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

11 years agouse texture gather emulation for the shadowmap sampler path, and use it by default...
eihrul [Sat, 19 May 2012 04:17:00 +0000 (04:17 +0000)]
use texture gather emulation for the shadowmap sampler path, and use it by default instead of texture gather

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

11 years agofix an infinite loop if an engine cvar is being restored, that did not
havoc [Wed, 25 Jul 2012 07:45:10 +0000 (07:45 +0000)]
fix an infinite loop if an engine cvar is being restored, that did not
exist at init (but it still warns about it), thanks to Omega for
debugging this

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

11 years agofix bloom rendering bugs caused by lingering state from transparent
havoc [Sun, 22 Jul 2012 00:49:35 +0000 (00:49 +0000)]
fix bloom rendering bugs caused by lingering state from transparent
entity rendering (this bug was hidden by r_coronas before)

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

11 years agodon't double-apply slowmo when playing back non-darkplaces demos (this
havoc [Sun, 22 Jul 2012 00:50:49 +0000 (00:50 +0000)]
don't double-apply slowmo when playing back non-darkplaces demos (this
fixes the bug where if you changed slowmo during a demo to a low value
and back it would often take a long time to reach the next frame before
applying the new value)

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

11 years agodon't honor cl.paused or host_framerate in demo playback (to fix Malice
havoc [Sat, 21 Jul 2012 22:27:19 +0000 (22:27 +0000)]
don't honor cl.paused or host_framerate in demo playback (to fix Malice
intro demos which otherwise get paused and stay there)

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

11 years agodon't put lines starting with rcon_password in the history
divverent [Wed, 27 Jun 2012 12:31:50 +0000 (12:31 +0000)]
don't put lines starting with rcon_password in the history

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

11 years agofix for hip1m1 gold key door - favor earlier entity result in cliptrace
havoc [Sat, 23 Jun 2012 04:54:58 +0000 (04:54 +0000)]
fix for hip1m1 gold key door - favor earlier entity result in cliptrace
combining (use of < operator preferred over <=)

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

11 years agouri_postbuf: copy the content-type, do not keep a reference to qc
divverent [Fri, 22 Jun 2012 11:12:36 +0000 (11:12 +0000)]
uri_postbuf: copy the content-type, do not keep a reference to qc

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

11 years agorename a macro with misleading name, as TriangleOverlapsBox doesn't check for actual...
divverent [Fri, 15 Jun 2012 08:08:38 +0000 (08:08 +0000)]
rename a macro with misleading name, as TriangleOverlapsBox doesn't check for actual triangle/box overlap, but just whether an overlap is possible at all using a bbox check. No functional changes, just search/replace.

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

11 years agofix two crashes introduced by vortex ( r11822 ) on sprites and nomodels
havoc [Fri, 15 Jun 2012 02:14:09 +0000 (02:14 +0000)]
fix two crashes introduced by vortex ( r11822 ) on sprites and nomodels

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

11 years agoNew shader keyword dptransparentsort (can be "sky", "distance", "hud") which forces...
vortex [Thu, 24 May 2012 17:32:00 +0000 (17:32 +0000)]
New shader keyword dptransparentsort (can be "sky", "distance", "hud") which forces one of transparent sort techniques. EF_NODEPTHTEST and RENDER_WORLDOBJECT entity flags have greater priority and override shader-set transparent sort technique.
New cvar q3shader_force_terrain_alphaflag which sets TEXF_ALPHA on both vertextextureblend textures (fixes r_glsl_vertextextureblend_usebothalphas).

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

11 years agoadded note about multi-gpu on the descriptions of r_motionblur and
havoc [Sun, 27 May 2012 23:23:12 +0000 (23:23 +0000)]
added note about multi-gpu on the descriptions of r_motionblur and
r_damageblur cvars

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

11 years agofix a misleading error "Mod_ForName: NULL name"
divverent [Sun, 10 Jun 2012 17:07:15 +0000 (17:07 +0000)]
fix a misleading error "Mod_ForName: NULL name"

as that one means empty name, not NULL

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

11 years agosync dpdefs with xonotic
divverent [Sun, 10 Jun 2012 16:45:08 +0000 (16:45 +0000)]
sync dpdefs with xonotic

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

11 years agoMem_Realloc: allow the pool to be NULL in which case the block's previous pool is...
divverent [Wed, 6 Jun 2012 14:07:46 +0000 (14:07 +0000)]
Mem_Realloc: allow the pool to be NULL in which case the block's previous pool is used

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

11 years agodisable r_coronas by default
havoc [Sun, 27 May 2012 23:22:45 +0000 (23:22 +0000)]
disable r_coronas by default
disable r_coronas_occlusionquery by default (bad performance, especially
on multi-gpu)

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

11 years agofix alphatest surfaces in GL11 path
divverent [Wed, 16 May 2012 07:44:52 +0000 (07:44 +0000)]
fix alphatest surfaces in GL11 path

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

11 years agomultiple fog fixes for GL11/GL13 render path
divverent [Wed, 16 May 2012 07:44:42 +0000 (07:44 +0000)]
multiple fog fixes for GL11/GL13 render path

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

11 years agoreorder printf fields
divverent [Tue, 15 May 2012 10:32:51 +0000 (10:32 +0000)]
reorder printf fields

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

12 years agoreorder printf fields
divverent [Tue, 15 May 2012 10:32:51 +0000 (10:32 +0000)]
reorder printf fields

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

12 years agoworkaround for broken libc on mingw32
divverent [Sun, 13 May 2012 19:08:32 +0000 (19:08 +0000)]
workaround for broken libc on mingw32

mingw32-gcc claims to be C99, but its sprintf() isn't

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

12 years agofix some int to bool conversion warnings on MSVS2008
havoc [Sat, 5 May 2012 21:29:07 +0000 (21:29 +0000)]
fix some int to bool conversion warnings on MSVS2008

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

12 years agoredesigned r_celoutlines shader code to be a shadowing method rather than edge detect...
havoc [Sat, 5 May 2012 21:24:08 +0000 (21:24 +0000)]
redesigned r_celoutlines shader code to be a shadowing method rather than edge detect, looks better now

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

12 years agofix a stupid overrun in OP_DONE/OP_RETURN when trying to return one of the last two...
divverent [Sun, 29 Apr 2012 15:49:56 +0000 (15:49 +0000)]
fix a stupid overrun in OP_DONE/OP_RETURN when trying to return one of the last two globals

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

12 years agoR_MeshQueue_AddTransparent: Switch checks for RENDER_NODEPTHTEST and RENDER_WORLDOBJE...
vortex [Tue, 24 Apr 2012 19:05:21 +0000 (19:05 +0000)]
R_MeshQueue_AddTransparent: Switch checks for RENDER_NODEPTHTEST and RENDER_WORLDOBJECT so RENDER_WORLDOBJECT keeps it's sorting index even if have RENDER_NODEPTHTEST.

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

12 years agoadd extra var DP_GMP_STATIC_LIBDIR
divverent [Sat, 21 Apr 2012 13:46:27 +0000 (13:46 +0000)]
add extra var DP_GMP_STATIC_LIBDIR

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

12 years agoVM_sprintf: use intmax_t for integer types
divverent [Fri, 20 Apr 2012 08:46:33 +0000 (08:46 +0000)]
VM_sprintf: use intmax_t for integer types

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

12 years agofix ReadPicture/WritePicture for sizes > 32k
divverent [Fri, 20 Apr 2012 08:20:43 +0000 (08:20 +0000)]
fix ReadPicture/WritePicture for sizes > 32k

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

12 years agofix a few more redundancies with PRVM_64
havoc [Fri, 20 Apr 2012 01:56:30 +0000 (01:56 +0000)]
fix a few more redundancies with PRVM_64

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

12 years agofix several issues with PRVM_64, mostly cleaning up (int) casts
havoc [Fri, 20 Apr 2012 01:40:13 +0000 (01:40 +0000)]
fix several issues with PRVM_64, mostly cleaning up (int) casts

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

12 years agofix a warning that was there for a while
divverent [Thu, 19 Apr 2012 20:27:57 +0000 (20:27 +0000)]
fix a warning that was there for a while

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

12 years agoremove some more dead code
divverent [Thu, 19 Apr 2012 20:27:53 +0000 (20:27 +0000)]
remove some more dead code

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

12 years agoremove some more dead code ("Dead Increment" bugs from clang-analyzer); however,...
divverent [Thu, 19 Apr 2012 20:27:45 +0000 (20:27 +0000)]
remove some more dead code ("Dead Increment" bugs from clang-analyzer); however, many of these were kept there as they help making code more readable/maintainable (e.g. incrementing data pointer after the LAST read from a model)

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

12 years agoremove some dead initializations that clang-analyzer found (verified)
divverent [Thu, 19 Apr 2012 19:55:26 +0000 (19:55 +0000)]
remove some dead initializations that clang-analyzer found (verified)

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

12 years agohandle the unlikely case of qglXSwapIntervalSGI becoming invalid after GL restart...
divverent [Thu, 19 Apr 2012 19:52:58 +0000 (19:52 +0000)]
handle the unlikely case of qglXSwapIntervalSGI becoming invalid after GL restart (found by clang-analyzer)

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

12 years agomark Host_Error as noreturn to help static analysis
divverent [Thu, 19 Apr 2012 19:48:29 +0000 (19:48 +0000)]
mark Host_Error as noreturn to help static analysis

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

12 years agochanged PRVM_ValueString (used by prvm_global, prvm_globals, prvm_edict,
havoc [Thu, 19 Apr 2012 11:48:07 +0000 (11:48 +0000)]
changed PRVM_ValueString (used by prvm_global, prvm_globals, prvm_edict,
prvm_edicts) to print floats and vectors with more precision (using the
FLOAT_LOSSLESS_FORMAT and VECTOR_LOSSLESS_FORMAT macros previously added)

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