]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
havoc [Thu, 27 Jun 2013 06:55:10 +0000 (06:55 +0000)]
reenabled index buffers on GLES2 path
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11962
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cac6f0a6362c2c75dc6e80717f4fe4a452db0533
havoc [Thu, 27 Jun 2013 06:20:52 +0000 (06:20 +0000)]
fix severe (crashing) bugs with two calls to qglDrawElements when using
index buffers (this bug was hidden by gl_mesh_drawrangeelements being 1
by default)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11961
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
48aa8723e4e82f2329a6053f95075af8cbf37444
havoc [Thu, 27 Jun 2013 05:57:31 +0000 (05:57 +0000)]
remove cvar gl_mesh_prefer_short_elements because many draw calls do not
even provide an element3i to use
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11960
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
36dc9ea8b11d602992f66aeec3750b819dfdb43b
havoc [Thu, 27 Jun 2013 05:53:59 +0000 (05:53 +0000)]
allow use of cvar gl_vbo_dynamicindex in RENDERPATH_GLES2
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11959
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
df69ff9acd9810e5ede63838e599bf591f6fae8d
havoc [Wed, 19 Jun 2013 02:47:18 +0000 (02:47 +0000)]
further optimizations for gl_vbo_dynamicvertex and gl_vbo_dynamicindex
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11958
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0dd8830eec75a0a7022afa625943b9439538b313
havoc [Wed, 19 Jun 2013 01:42:17 +0000 (01:42 +0000)]
gl_vbo_dynamicvertex and gl_vbo_dynamicindex now use R_BufferData_Store
rather than the much slower path they used before
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11957
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
225c8fd3bb44a70344a8994c9da3ebe3f4d19224
havoc [Wed, 19 Jun 2013 01:27:59 +0000 (01:27 +0000)]
some cleanup of glDelete calls to guard against bugs caused by GL
changing the binding when we delete a currently active object
fix a major resource leak by calling R_FrameData_NewFrame and
R_BufferData_NewFrame earlier so that they work when disconnected
improved gl_vbostats output
clarify some logic related to r_batch_dynamicbuffer
don't bother destroying a temporary vertex buffer that we end up
destroying as part of the array cleanup
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11956
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5a4be9fc214e0831a862d51f702510d2a002fa4b
havoc [Tue, 18 Jun 2013 23:01:15 +0000 (23:01 +0000)]
fix a critical bug with r_restart or vid_restart in R_BufferData_Reset
where it did not properly reset all buffers
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11955
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d4ffca10b770837060cfd8bd43ed11dd810352f8
havoc [Tue, 18 Jun 2013 21:08:14 +0000 (21:08 +0000)]
renamed r_bufferdatasize_ cvars to r_buffermegs_ to give them new good
values, as the old cvar increase logic was badly bugged and would
arbitrarily increase them when not necessary
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11954
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6c5a78cc0978d15d0abe445535042d43c64bf898
havoc [Tue, 18 Jun 2013 20:51:30 +0000 (20:51 +0000)]
removed allowfail flag on R_BufferData_Store and made cvar management
more consistent, increased the buffer cycle to 3 frames
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11953
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fb52dfb48cce4eb85fd934852ecb2eab8ee58120
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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