]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
9 years agoDisable gpu skinning for skeletal models nyov/debian-patchseries
David Bate [Sat, 11 Jan 2014 17:08:04 +0000 (11:08 -0600)]
Disable gpu skinning for skeletal models

This feature is buggy and sometimes causes models to completely
lack animation and can cause very high frame rates.  Xonotic
developers are aware of this and disabling this feature is the
temporary work around. See http://dev.xonotic.org/issues/1459

[now https://gitlab.com/xonotic/xonotic-data.pk3dir/issues/1011 -nyov]

9 years agoDisable dlopen support, and warn if it gets compiled in
Simon McVittie [Fri, 17 May 2013 23:42:19 +0000 (00:42 +0100)]
Disable dlopen support, and warn if it gets compiled in

Forwarded: no, Debian-specific

9 years agoAdd support for disabling libavw
Simon McVittie [Fri, 17 May 2013 23:36:31 +0000 (00:36 +0100)]
Add support for disabling libavw

As with all the other dlopen()'d libraries, if we're going to use them,
we should link them properly so dpkg-shlibdeps can pick up the
right versioned dependencies. Xonotic 0.7.0 doesn't seem to ship
this one so we can probably just omit it.

Origin: vendor, Debian
Forwarded: no

9 years agoIf linking libpng in the normal way, use its actual version number
Simon McVittie [Sat, 21 Jan 2012 22:27:33 +0000 (22:27 +0000)]
If linking libpng in the normal way, use its actual version number

Also avoid redefining more stuff that's normally in the libpng headers.

Origin: vendor, Debian

9 years agoIf linking libpng normally, use its header to get the png_uint_32 type
Simon McVittie [Sat, 21 Jan 2012 22:23:03 +0000 (22:23 +0000)]
If linking libpng normally, use its header to get the png_uint_32 type

This avoids needing to work around ABI differences, particularly in
newer versions of libpng: if we know which version we're using, it's
all simpler.

Origin: vendor, Debian

9 years agoIf linking libpng conventionally, use the png_jmpbuf macro
Simon McVittie [Sat, 21 Jan 2012 22:19:29 +0000 (22:19 +0000)]
If linking libpng conventionally, use the png_jmpbuf macro

This is necessary to compile against libpng 1.5.x.

Origin: vendor, Debian

9 years agoDon't build SSE-only software rasterizer on non-x86 CPUs
Simon McVittie [Sat, 21 Jan 2012 17:19:30 +0000 (17:19 +0000)]
Don't build SSE-only software rasterizer on non-x86 CPUs

Compilers for non-x86 platforms don't understand -msse or -msse2, and
these files aren't usable on non-x86 anyway.

Origin: vendor, Debian

9 years agoFix various typos: dont -> don't, doesnt -> doesn't, arguements -> arguments
Simon McVittie [Fri, 20 Jan 2012 09:34:00 +0000 (09:34 +0000)]
Fix various typos: dont -> don't, doesnt -> doesn't, arguements -> arguments

Picked up by Debian's Lintian package-checking tool.

Origin: vendor, Debian

9 years agoBe a bit more type-safe about using libpng
Simon McVittie [Fri, 20 Jan 2012 09:26:10 +0000 (09:26 +0000)]
Be a bit more type-safe about using libpng

The simplified libpng declarations in DarkPlaces just use "void **" for
various pointer-to-pointer arguments. However, this conflicts with the system
libpng headers (if used), which expect something like "png_struct **" (which
is not considered to be a compatible type by ISO C), causing compiler
warnings. This patch reduces the simplification a bit by distinguishing
between the various pointers-to-struct enough that system libpng headers
do not provoke warnings.

Similarly, assigning a function pointer provokes warnings if the arguments'
types are not exactly as expected. Avoiding those warnings potentially makes
genuine bugs easier to spot, so it seems worth being a bit more precise.

Origin: vendor, Debian

9 years agoBe more type-safe when calling setjmp(); call the same one that libpng would
Simon McVittie [Thu, 7 Jul 2011 17:11:42 +0000 (18:11 +0100)]
Be more type-safe when calling setjmp(); call the same one that libpng would

Depending whether _BSD_SOURCE is preferred, glibc will provide one of two
implementations of setjmp()/longjmp() (it either does or doesn't save the
signal mask), acting on different definitions of the jmp_buf struct.

libpng calls longjmp() internally, and expects its callers to call the
version of setjmp() corresponding to the longjmp() call that libpng would
make.

In an attempt to ensure that consistent versions of setjmp() and longjmp()
are used, pngconf.h insists that on Linux, setjmp.h has not already been
included. However, quakedef.h includes that header, leading to some
interesting contortions when using the system libpng.

(IMO the right thing for libpng to do would be for it to provide an exported
function png_setjmp (or something) which calls the version of setjmp() that
libpng expects on the jmp_buf included in the png structure, like qpng_setjmp
in this patch.)

When using the system libpng headers, this patch also avoids the assumption
that jmp_buf is the first thing in the png structure.

9 years agoimage_png.h: change name of multiple-inclusion guard to not interfere with <png.h>
Simon McVittie [Thu, 7 Jul 2011 16:04:19 +0000 (17:04 +0100)]
image_png.h: change name of multiple-inclusion guard to not interfere with <png.h>

Origin: vendor, Debian

9 years agoFix OS detection of darkplaces' makefile to not think it's on BSD on GNU/kFreeBSD
Cyril Brulebois [Tue, 26 Dec 2006 11:24:24 +0000 (12:24 +0100)]
Fix OS detection of darkplaces' makefile to not think it's on BSD on GNU/kFreeBSD

[The DarkPlaces build system mostly cares about userland, not the kernel,
and GNU/kFreeBSD is equivalent to GNU/Linux in that respect. -smcv]

9 years agoAdd support for forcing d0_blind_id and d0_rijndael to never be dlopen'd
Simon McVittie [Fri, 20 Jan 2012 09:24:18 +0000 (09:24 +0000)]
Add support for forcing d0_blind_id and d0_rijndael to never be dlopen'd

Until these libraries exist as Debian packages, we'd prefer a local copy
(which might not be compatible) to never be loaded accidentally.

Origin: vendor, Debian

9 years agoAdd support for linking to system d0_blind_id and d0_rijndael
Simon McVittie [Wed, 6 Jul 2011 17:03:34 +0000 (18:03 +0100)]
Add support for linking to system d0_blind_id and d0_rijndael

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

(These libraries aren't currently in Debian, but if they were, we'd want
to link them like this.)

Origin: vendor, Debian

9 years agoAdd LINK_TO_FREETYPE2
Simon McVittie [Wed, 6 Jul 2011 09:16:15 +0000 (10:16 +0100)]
Add LINK_TO_FREETYPE2

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoadd LINK_TO_CURL
Simon McVittie [Fri, 20 Jan 2012 09:22:20 +0000 (09:22 +0000)]
add LINK_TO_CURL

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoAdd LINK_TO_PNG
Simon McVittie [Fri, 20 Jan 2012 09:15:48 +0000 (09:15 +0000)]
Add LINK_TO_PNG

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoadd LINK_TO_THEORA
Simon McVittie [Fri, 20 Jan 2012 09:14:26 +0000 (09:14 +0000)]
add LINK_TO_THEORA

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoadd LINK_TO_ODE to link against system libode
Simon McVittie [Wed, 6 Jul 2011 08:33:19 +0000 (09:33 +0100)]
add LINK_TO_ODE to link against system libode

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoAdd LINK_TO_MODPLUG option
Simon McVittie [Wed, 6 Jul 2011 08:50:54 +0000 (09:50 +0100)]
Add LINK_TO_MODPLUG option

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoAdd support for LINK_TO_LIBVORBIS (using pkg-config)
Simon McVittie [Tue, 5 Jul 2011 21:16:28 +0000 (22:16 +0100)]
Add support for LINK_TO_LIBVORBIS (using pkg-config)

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoAdd support for "make LINK_TO_ZLIB=1"
Simon McVittie [Tue, 5 Jul 2011 21:09:07 +0000 (22:09 +0100)]
Add support for "make LINK_TO_ZLIB=1"

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoAdd support for "make LINK_TO_LIBJPEG=1"
Simon McVittie [Tue, 5 Jul 2011 21:08:51 +0000 (22:08 +0100)]
Add support for "make LINK_TO_LIBJPEG=1"

In Debian we want library dependencies to work in the conventional way,
since many tools expect that and use it to generate package
dependencies.

Origin: vendor, Debian

9 years agoSplit (Unix) CFLAGS, libs to one per line
Simon McVittie [Tue, 5 Jul 2011 21:05:38 +0000 (22:05 +0100)]
Split (Unix) CFLAGS, libs to one per line

This just makes it easier to change them in later patches.

Origin: vendor, Debian

11 years agoimage_png: libpng16 support (by graphitemaster) xonotic-v0.7.0
divverent [Wed, 29 May 2013 16:53:08 +0000 (16:53 +0000)]
image_png: libpng16 support (by graphitemaster)

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

11 years agoImplement DSCP for ToS according to RFC2474 / RFC4594
divverent [Sat, 25 May 2013 14:08:53 +0000 (14:08 +0000)]
Implement DSCP for ToS according to RFC2474 / RFC4594

From: Merlijn Hofstra <merlijn@Merlijns-MacBook-Air.local>

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

11 years agoclarify the code when gl_mesh_prefer_short_elements is off
havoc [Wed, 22 May 2013 06:45:43 +0000 (06:45 +0000)]
clarify the code when gl_mesh_prefer_short_elements is off

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

11 years agoorder postprocess code properly (so blur does not cancel bloom)
divverent [Wed, 8 May 2013 10:41:01 +0000 (10:41 +0000)]
order postprocess code properly (so blur does not cancel bloom)

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

11 years agofix a floating around mutexattr object
divverent [Mon, 6 May 2013 09:54:55 +0000 (09:54 +0000)]
fix a floating around mutexattr object

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

11 years agofix a possible pthread crash
divverent [Mon, 6 May 2013 09:50:57 +0000 (09:50 +0000)]
fix a possible pthread crash

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

11 years agoVM_CL_findradius now uses World_EntitiesInBox as it should
havoc [Sun, 5 May 2013 04:04:34 +0000 (04:04 +0000)]
VM_CL_findradius now uses World_EntitiesInBox as it should

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

11 years agofix endless loop with gcc 4.8
divverent [Fri, 19 Apr 2013 09:40:43 +0000 (09:40 +0000)]
fix endless loop with gcc 4.8

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

11 years agoadd prvm_uint_t type
havoc [Wed, 17 Apr 2013 02:33:45 +0000 (02:33 +0000)]
add prvm_uint_t type

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

11 years agooptimized vm by using cached local variables instead of accessing prog->
havoc [Tue, 16 Apr 2013 22:51:33 +0000 (22:51 +0000)]
optimized vm by using cached local variables instead of accessing prog->
fields all the time

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

11 years agoadded prvm_uint_t for bounds check tests in the vm
havoc [Tue, 16 Apr 2013 22:17:09 +0000 (22:17 +0000)]
added prvm_uint_t for bounds check tests in the vm

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

11 years agoOPENGL_ORIENTATION -> MATRIX4x4_OPENGLORIENTATION
eihrul [Thu, 18 Apr 2013 17:30:25 +0000 (17:30 +0000)]
OPENGL_ORIENTATION -> MATRIX4x4_OPENGLORIENTATION

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

11 years agoset vid_stereobuffer cvar based on whether GL_STEREO is true after setting the mode
havoc [Wed, 17 Apr 2013 07:13:52 +0000 (07:13 +0000)]
set vid_stereobuffer cvar based on whether GL_STEREO is true after setting the mode

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

11 years agofix a severe texture corruption and crash case when using vid_dx9 1 is used with...
havoc [Wed, 17 Apr 2013 02:46:57 +0000 (02:46 +0000)]
fix a severe texture corruption and crash case when using vid_dx9 1 is used with vid_sRGB 1
work around a crash when using vid_dx9 1 with vid_stereobuffer 1 (this needs a better fix, D3D9 does not support this)
fix a warning in C++ where a bit flag mask was being passed as a bool

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

11 years agouse unsigned comparisons for most of the boundschecks in the vm
havoc [Tue, 16 Apr 2013 21:57:17 +0000 (21:57 +0000)]
use unsigned comparisons for most of the boundschecks in the vm

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

11 years agoipv6 dpmaster.sudo.rm-f.org has moved
divverent [Tue, 16 Apr 2013 08:51:32 +0000 (08:51 +0000)]
ipv6 dpmaster.sudo.rm-f.org has moved

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

11 years agoclarify a comment
havoc [Tue, 16 Apr 2013 03:24:09 +0000 (03:24 +0000)]
clarify a comment

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

11 years agowhen using engine particles (not effectinfo), prevent spawning particles
havoc [Tue, 16 Apr 2013 03:22:39 +0000 (03:22 +0000)]
when using engine particles (not effectinfo), prevent spawning particles
for EFFECT_EF_FLAME and EFFECT_EF_STARDUST when paused

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

11 years agofix two very ambiguous for loops that calculate camerawidth and
havoc [Tue, 16 Apr 2013 03:16:17 +0000 (03:16 +0000)]
fix two very ambiguous for loops that calculate camerawidth and
cameraheight

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

11 years agouse int not qboolean for glshaderversion
havoc [Tue, 16 Apr 2013 03:09:01 +0000 (03:09 +0000)]
use int not qboolean for glshaderversion

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

11 years agoRewritten SVQC stringbuffer saving routines (which is part of yet unfinished databuff...
vortex [Thu, 28 Mar 2013 20:24:13 +0000 (20:24 +0000)]
Rewritten SVQC stringbuffer saving routines (which is part of yet unfinished databuffers extension). Changes are backwards compatible with old savefile format. Now, once saved stringbuffers are found in extended savegame section, all string buffers allocated by worldspawn()/entityspawn (which is processed prior to savegame parsing) are deleted, and stringbuffers are restored from savegamefile with their original handles.

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

11 years agomove extension enables to the top of the shader to comply with spec
eihrul [Mon, 1 Apr 2013 15:58:00 +0000 (15:58 +0000)]
move extension enables to the top of the shader to comply with spec

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

11 years agoenable UBO extension for skeletal
eihrul [Mon, 1 Apr 2013 15:54:53 +0000 (15:54 +0000)]
enable UBO extension for skeletal

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

11 years agodisable depthfirst rendering on animated models since it doesn't work and should...
eihrul [Tue, 26 Mar 2013 22:19:01 +0000 (22:19 +0000)]
disable depthfirst rendering on animated models since it doesn't work and should theoretically have little performance benefit (and most likely performance detriment)

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

11 years agofix boneposerelative address
eihrul [Tue, 26 Mar 2013 21:01:54 +0000 (21:01 +0000)]
fix boneposerelative address

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

11 years agofactor out skeletal animation transform generation so that it can be reused
eihrul [Tue, 26 Mar 2013 19:34:00 +0000 (19:34 +0000)]
factor out skeletal animation transform generation so that it can be reused

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

11 years agoreworked the MOVETYPE_WALK and MOVETYPE_STEP sticking logic so that it
havoc [Sun, 24 Mar 2013 18:20:15 +0000 (18:20 +0000)]
reworked the MOVETYPE_WALK and MOVETYPE_STEP sticking logic so that it
only cares about world when deciding to be stuck, this means if you get
into a bmodel entity you can still move out of it

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

11 years agochanged MOVETYPE_STEP and MOVETYPE_WALK to match Quake behavior (unable
havoc [Sat, 2 Mar 2013 04:57:07 +0000 (04:57 +0000)]
changed MOVETYPE_STEP and MOVETYPE_WALK to match Quake behavior (unable
to move when allsolid - but also check SUPERCONTENTS_SOLID), this makes
hip2m3 shalrath work again

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

11 years agodon't call glGetUniformBlockIndex without GL_ARB_uniform_buffer_object
havoc [Tue, 5 Mar 2013 01:05:14 +0000 (01:05 +0000)]
don't call glGetUniformBlockIndex without GL_ARB_uniform_buffer_object
as the pointer is NULL (this crashed OpenGL 2.0-3.0 drivers)

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

11 years agorestrict which CHANNELFLAG_ values can be used in sound7 builtin, to
havoc [Sun, 3 Mar 2013 01:59:37 +0000 (01:59 +0000)]
restrict which CHANNELFLAG_ values can be used in sound7 builtin, to
keep qc from using internal-only ones

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

11 years agofix C++ compile error
havoc [Sat, 2 Mar 2013 00:42:01 +0000 (00:42 +0000)]
fix C++ compile error

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

11 years agoimplemented r_batch_dynamicbuffer which allows the rsurface batching
havoc [Thu, 28 Feb 2013 11:41:40 +0000 (11:41 +0000)]
implemented r_batch_dynamicbuffer which allows the rsurface batching
code to produce dynamic vertex/index buffers using R_BufferData_Store

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

11 years agosound7(): properly support channel flags on client; reassign sound flags so FORCELOOP...
divverent [Thu, 28 Feb 2013 11:39:47 +0000 (11:39 +0000)]
sound7(): properly support channel flags on client; reassign sound flags so FORCELOOP is now 2 (and FULLVOLUME is 16); note that these flags only work on csqc for now

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

11 years agorestore flags feature in csqc sound7 builtin, so that mods can use
havoc [Thu, 28 Feb 2013 09:46:44 +0000 (09:46 +0000)]
restore flags feature in csqc sound7 builtin, so that mods can use
CHANNELFLAG_FORCELOOP and others as before

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

11 years agocsqc sound7 call now looks at the global variable sound_starttime to
havoc [Thu, 28 Feb 2013 09:44:12 +0000 (09:44 +0000)]
csqc sound7 call now looks at the global variable sound_starttime to
calculate a startposition from, this allows a sound to be played at a
later time (delayed) or an earlier time (for instance restoring a
dialogue sound in-progress when loading a savegame)

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

11 years agochanged the default sv_gameplayfix_ cvar values based on GAME_,
havoc [Thu, 28 Feb 2013 09:36:29 +0000 (09:36 +0000)]
changed the default sv_gameplayfix_ cvar values based on GAME_,
GAME_NORMAL (quake) and derivatives now default them to 0 for better
compatibility and avoiding gameplay changes, non-quake games such as
GAME_NEXUIZ and others are unaffected (still default to 1 there)

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

11 years agoimplemented use of GL_ARB_uniform_buffer_object for r_glsl_skeletal
havoc [Thu, 28 Feb 2013 09:30:03 +0000 (09:30 +0000)]
implemented use of GL_ARB_uniform_buffer_object for r_glsl_skeletal
added R_BufferData_ system which allows arbitrary vertex/index/uniform
buffers to be dynamically built during a frame (in the same way as the
R_FrameData_ system), this has vastly better performance than uploading
them individually and code should be migrated to use it as appropriate
vid.support.glshaderversion added (typically 140)

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

11 years agoimplemented loading of the RMQe variant of BSP2 ("2PSB")
havoc [Thu, 28 Feb 2013 00:21:59 +0000 (00:21 +0000)]
implemented loading of the RMQe variant of BSP2 ("2PSB")

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

11 years agofix typo in cvar description (grude -> crude)
havoc [Thu, 28 Feb 2013 00:21:22 +0000 (00:21 +0000)]
fix typo in cvar description (grude -> crude)

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

11 years agoimplemented loading of the RMQe variant of BSP2 ("2PSB")
havoc [Thu, 28 Feb 2013 00:21:01 +0000 (00:21 +0000)]
implemented loading of the RMQe variant of BSP2 ("2PSB")

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

11 years agofix another warning in crypto.c
divverent [Wed, 27 Feb 2013 13:30:07 +0000 (13:30 +0000)]
fix another warning in crypto.c

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

11 years agoremove unused variable
divverent [Wed, 27 Feb 2013 13:30:04 +0000 (13:30 +0000)]
remove unused variable

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

11 years agorename CHANFLAG_RELIABLE to SOUNDFLAG_RELIABLE to match dpdefs; remove accidental...
divverent [Wed, 27 Feb 2013 11:38:50 +0000 (11:38 +0000)]
rename CHANFLAG_RELIABLE to SOUNDFLAG_RELIABLE to match dpdefs; remove accidental flags passing in CL_sound()

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

11 years agoAdd a cvar to change menu progs filename
divverent [Mon, 25 Feb 2013 12:28:46 +0000 (12:28 +0000)]
Add a cvar to change menu progs filename

From: Mario <mario.mario@y7mail.com>

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

11 years agoremoved cvar sv_gameplayfix_stepwhilejumping which wasn't needed
havoc [Mon, 25 Feb 2013 04:40:39 +0000 (04:40 +0000)]
removed cvar sv_gameplayfix_stepwhilejumping which wasn't needed
(sv_jumpstep is no longer dependent on this cvar)

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

11 years agoNevermind, we can't remove that STX char... just add \{3} for our purposes
divverent [Sun, 24 Feb 2013 16:59:37 +0000 (16:59 +0000)]
Nevermind, we can't remove that STX char... just add \{3} for our purposes

From: Samual Lenks <samual@xonotic.org>

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

11 years agoFix bug with cl_parse.c putting extra \2 in the Con_Printf() line
divverent [Sun, 24 Feb 2013 16:59:33 +0000 (16:59 +0000)]
Fix bug with cl_parse.c putting extra \2 in the Con_Printf() line

From: Samual Lenks <samual@xonotic.org>

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

11 years agoLets add the ability to have silent messages sent to the chatbox, this is so that...
divverent [Sun, 24 Feb 2013 16:59:30 +0000 (16:59 +0000)]
Lets add the ability to have silent messages sent to the chatbox, this is so that it can later replace the console output in Xonotic

From: Samual <samual@xonotic.org>

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

11 years agofix C++ compile error
havoc [Sat, 23 Feb 2013 21:55:11 +0000 (21:55 +0000)]
fix C++ compile error

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

11 years agofix bug where particle textures scroll in GL11/GL13 paths
havoc [Sat, 23 Feb 2013 12:23:39 +0000 (12:23 +0000)]
fix bug where particle textures scroll in GL11/GL13 paths

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

11 years agoadded entity caching stats in graph
havoc [Sat, 23 Feb 2013 11:08:31 +0000 (11:08 +0000)]
added entity caching stats in graph
optimized logic for animcache and dynamic batching
optimized r_shadows code which was often casting shadows from entities
it did not animcache, and these entities didn't need to cast anyway,
imposed an artificial limit of 1024 entities in r_shadows code...
now exactly determines if models are animated at load (except iqm which
is trusted), and the isanimated flag is not needed for animating a
skeletal model with skeletonobject

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

11 years agoremoved frames last second report in r_speeds graph
havoc [Sat, 23 Feb 2013 07:38:19 +0000 (07:38 +0000)]
removed frames last second report in r_speeds graph

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

11 years agochanged r_refdef.stats struct to be an array indexed by r_stat_* enums
havoc [Sat, 23 Feb 2013 07:37:10 +0000 (07:37 +0000)]
changed r_refdef.stats struct to be an array indexed by r_stat_* enums
added r_speeds_graph and associated cvars, this will visually graph any
chosen renderer statistics (8 allowed at one time)
added a lot of additional statistics for the batcher

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

11 years agoadded velocity-oriented blood decals, cvar is cl_decals_newsystem_bloodsmears
havoc [Sat, 23 Feb 2013 07:34:07 +0000 (07:34 +0000)]
added velocity-oriented blood decals, cvar is cl_decals_newsystem_bloodsmears

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

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