]>
git.rm.cloudns.org Git - xonotic/darkplaces.git/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
havoc [Thu, 19 Apr 2012 09:18:21 +0000 (09:18 +0000)]
fix severe bugs with the PRVM_64 support, which affected both modes of
operation (PRVM_64 defined or not) - the OP_LOAD_ operations were
converting between float and int unintentionally
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11799
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b3a7dceeadcebc770ad668e3bbd23cefd2c6f14d
havoc [Thu, 19 Apr 2012 09:17:39 +0000 (09:17 +0000)]
fix some redundant int to float to double casts when using PRVM_64
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11798
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0a70d4bc7d206e921f5467e583cc4a16415b5696
divverent [Thu, 19 Apr 2012 08:06:50 +0000 (08:06 +0000)]
fix writing using libpng15
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11797
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bdda65ec4ede57a1d8d52219d63687595d57328a
havoc [Tue, 17 Apr 2012 21:29:58 +0000 (21:29 +0000)]
fix two bugs introduced in r11402 that broke dm6 teleporters and many
other triggers (was using overly padded mins and maxs)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11796
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
24f460fd92925f7f17f5235a13124be986e831d4
havoc [Sun, 15 Apr 2012 13:12:25 +0000 (13:12 +0000)]
disable PRVM_64 until the bugs are worked out
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11795
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0dd013ba837f113a9f9d270920afb4289030b1a0
havoc [Wed, 4 Apr 2012 07:07:59 +0000 (07:07 +0000)]
enable PRVM_64 define
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11786
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
140d4122eabb49d18ddc3d028f17199d140aba03
havoc [Wed, 4 Apr 2012 07:07:59 +0000 (07:07 +0000)]
UNMERGE! enable PRVM_64 define
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11786
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
140d4122eabb49d18ddc3d028f17199d140aba03
havoc [Thu, 12 Apr 2012 07:08:45 +0000 (07:08 +0000)]
fix a use of Cmd_Argv(1) as a dpsnprintf format string
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11794
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6a21a71154324bd358045e523e67a45bb5a32eb0
divverent [Wed, 11 Apr 2012 14:14:31 +0000 (14:14 +0000)]
fix a typo
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11793
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8bc387af4fd0c2e4bf5e5bb4c3f2fadb65d48ade
divverent [Wed, 11 Apr 2012 13:34:44 +0000 (13:34 +0000)]
PRVM_64: make savegames precision-loss-less
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11792
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
da3c5a5aa0e139aa68f51bec4d8c0763a99c908e
divverent [Wed, 11 Apr 2012 10:58:16 +0000 (10:58 +0000)]
fix "strings go past end of file" check
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11791
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
65d7926b2422eda155a0c4ae4a313e882f922c7e
havoc [Mon, 9 Apr 2012 03:06:33 +0000 (03:06 +0000)]
fix PRVM_E_INT which was severely bugged
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11790
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
67e216e593a42c6a2d1efcdbfbc4ea2fbebf9827
havoc [Thu, 5 Apr 2012 04:14:10 +0000 (04:14 +0000)]
use prvm_vec_t for spawn_parms storage
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11787
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef9d51a3182663ae22064b8cf91276aaf50c0129
havoc [Wed, 4 Apr 2012 07:07:59 +0000 (07:07 +0000)]
enable PRVM_64 define
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11786
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
140d4122eabb49d18ddc3d028f17199d140aba03
havoc [Wed, 4 Apr 2012 07:04:45 +0000 (07:04 +0000)]
added PRVM_64 define which upgrades the QC VM to double precision
variables (such that levels can run for more than 24 hours without
time precision breakdown, and bit arithmetic can be done on 52 bit flags
rather than 23 bit flags)
changed csqc setmodel builtin to do setsize as well (like on server)
fixed multiple bugs where csqc builtins were passing right as left in a
matrix conversion
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11785
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
add1a1b0abc10b8e720d74aeac52ad8276ee9fe0
divverent [Fri, 6 Apr 2012 18:20:32 +0000 (18:20 +0000)]
properly check for bloom being active
From: Rudolf Polzer <divverent@alientrap.org>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11789
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d1f1b8d6ee3ee5aa6e5688852aa904a67bc7710a
divverent [Fri, 6 Apr 2012 18:20:27 +0000 (18:20 +0000)]
Create a cvar which changes brightness when r_bloom is enabled. This is useful to tweak overall scene brightness when bloom is on, so that it matches the same brightness and the over-brightening caused by bloom can be somewhat canceled.
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11788
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5c14d50381283d88583257c848da5f38d8a6fd26
divverent [Sun, 1 Apr 2012 13:46:01 +0000 (13:46 +0000)]
put comment about wrong cppcheck warning (apparently got confused about scope of different "channel" vars)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11784
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0b82907912e90cfa8ad0595bf3ec7e960b753bb0
divverent [Sun, 1 Apr 2012 13:45:58 +0000 (13:45 +0000)]
fix out of buffer access in snd_3dras
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11783
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
318d016de32da5ed57d9347a43692d09f1877509
divverent [Sun, 1 Apr 2012 13:45:55 +0000 (13:45 +0000)]
set right include path for two #include commands
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11782
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8cdb11883916f1662d816e76878fe1b3b30b91f3
divverent [Sun, 1 Apr 2012 13:45:52 +0000 (13:45 +0000)]
another NULL dereference fixed
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11781
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d39ae1fecb0388a2727c3623e7bcf8e66659710c
divverent [Sun, 1 Apr 2012 13:45:48 +0000 (13:45 +0000)]
remove pointless NULL checks in gl_rmain as they can never hit without code crashing elsewhere; also, the pointer can never be NULL anyway
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11780
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9b037823e8d99857f00ad5b62e94dbe1861a1d82
divverent [Sun, 1 Apr 2012 13:30:20 +0000 (13:30 +0000)]
slightly simplify cmd and cvar code (also silences a - false - cppcheck error)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11779
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
462ee906731d1e2ee79707aaee0365ad717231ce
divverent [Sun, 1 Apr 2012 13:30:16 +0000 (13:30 +0000)]
fix NULL dereference in jam and avw video playback when out of memory
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11778
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
74f809fd8f84b602076fed464a114da2011a6f72
divverent [Sun, 1 Apr 2012 13:20:46 +0000 (13:20 +0000)]
fix a NULL pointer dereference in modeldecompile
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11777
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
72aa3ea5c69b7b504c1ff1b678720a36e6d4c806
Rudolf Polzer [Sun, 1 Apr 2012 09:42:28 +0000 (11:42 +0200)]
workaround bad whitespace commit
divverent [Sun, 1 Apr 2012 09:36:32 +0000 (09:36 +0000)]
FIX LINEFEEDS :(
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11776
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3f8700e3ba2c1afedc0982355ba868a157b961a5
divverent [Sun, 1 Apr 2012 09:36:28 +0000 (09:36 +0000)]
Turn off RFC 1149 on systems that have it enabled.
We got massive reports of lags on systems supporting this protocol.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11775
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fa561c1a0e1f754cab309168853a0e3b253081c8
eihrul [Sat, 24 Mar 2012 02:11:20 +0000 (02:11 +0000)]
R_Shadow_CullFrustumSide fixes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11773
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9611eeddfeecd981d676bc723baae07f3a3b7dce
havoc [Thu, 22 Mar 2012 00:48:23 +0000 (00:48 +0000)]
hush more warnings
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11772
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1379d2a277f18ed0104aab6326eadd993bd0cb73
havoc [Thu, 22 Mar 2012 00:44:28 +0000 (00:44 +0000)]
mark some functions as static to hush warnings
changed a VM_Warning to fix a format warning
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11771
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
093cad2cdacdc0faaa0803ab2829919fc8e2e48b
havoc [Wed, 21 Mar 2012 23:18:16 +0000 (23:18 +0000)]
implemented collision_triangle_axialsides cvar (default 1, matching
existing behavior)
implemented collision_triangle_bevelsides cvar (default 1, this changes
the side planes of triangles to be a 45 degree slope)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11770
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e1c5e21dc8298c37c8c3cd71cacc86b6a9f8e261
havoc [Wed, 21 Mar 2012 13:22:32 +0000 (13:22 +0000)]
fixed compilation on MSVS2008 - do not use stdint.h
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11769
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
465c3bc97a2db530368635a20de9d780c7a0d180
vortex [Tue, 20 Mar 2012 22:02:40 +0000 (22:02 +0000)]
r_editlights: added r_editlights_drawproperties cvar and read-only cvars for selected light properties (QC-based editor can query them).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11768
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b123ca46ecc7eb3950e2e5628bcb1fda4bc6ed86
vortex [Tue, 20 Mar 2012 21:55:04 +0000 (21:55 +0000)]
Work-in-progress extension: DP_QC_STRINGBUFFERS_EXT_WIP.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11767
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
adaa4ba5564a89300b5e8998d0ce95f75348135c
vortex [Tue, 20 Mar 2012 20:56:05 +0000 (20:56 +0000)]
Introducing LibAvW - a wrapper DLL to play videos using libav. Basic support includes extraction of video frames (sound files should be placed as separate .ogg's) and scaling. No ABI requirements (wrapper takes all dirty code). LibAvW can be found at: svn://svn.icculus.org/razorwind/trunk/dplibavw .
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11766
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e42e4168dcbbade766cfa8ad980e7975a14fa1bb
vortex [Tue, 20 Mar 2012 20:46:03 +0000 (20:46 +0000)]
cl_particles_reloadeffects <filename> - reload effects from custom effect file
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11765
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cf5fd37724378511010a798b1e761f79ea1bd87c
divverent [Sun, 18 Mar 2012 21:20:27 +0000 (21:20 +0000)]
checkpvs: use the right worldmodel
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11764
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ba53e4a4f414b39c5c38b9b00b072a363277f9a5
divverent [Sun, 18 Mar 2012 20:20:43 +0000 (20:20 +0000)]
document that celshading and celoutlines currently require GL2
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11763
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3e0f512280282ab42d58b503bff1c026c074ae75
havoc [Sat, 18 Feb 2012 21:52:00 +0000 (21:52 +0000)]
remove some undesired else's that break r_celshading and r_celoutlines
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11700
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9d4b72962f09d1696834b8339644c77000c9c125
havoc [Thu, 16 Feb 2012 20:14:15 +0000 (20:14 +0000)]
fix typos
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11691
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5b4332c25f6b650e575d5e07c5a8441747474d37
havoc [Wed, 15 Feb 2012 23:34:35 +0000 (23:34 +0000)]
added r_celshading cvar and GLSL shader code
added r_celoutlines cvar and GLSL shader code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11690
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d9ae9a6ab5eee7526f1972209c42cd7c331aadfd
havoc [Sun, 18 Mar 2012 19:07:28 +0000 (19:07 +0000)]
VM_FrameBlendFromFrameGroupBlend was using cl.time even on server
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11762
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d2036753773b0c3c0a5347bc48c82cb7eca296af
eihrul [Sun, 18 Mar 2012 17:16:46 +0000 (17:16 +0000)]
fix usage of linear filter when using shadowmap sampler
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11761
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
baa3b01fff70aa931cd52de2b969bfd0073afac7
divverent [Fri, 16 Mar 2012 05:49:43 +0000 (05:49 +0000)]
fix a typo in challenge flood protection
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11760
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
824342340b29f23f9147e6675d931f0057daefbd
divverent [Tue, 13 Mar 2012 06:44:51 +0000 (06:44 +0000)]
fix an unlikely crypto downgrade attack found during audit
if DP3 and earlier protocols are active, a malicious client may intervene
during connect with an authenticated player's connect and downgrade to
unauthenticated NQ protocol
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11758
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f8174044991f4ebf3a877716ef116e99e45916d6
divverent [Tue, 13 Mar 2012 06:44:47 +0000 (06:44 +0000)]
also block floods of getstatus, getinfo, getchallenge
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11757
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0bd9318d84491abce3aa7bac1e43e5359507f326
havoc [Tue, 13 Mar 2012 02:26:31 +0000 (02:26 +0000)]
use prog->progs_mempool for server DP_SKELETONOBJECTS storage, not
cls.levelmempool
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11756
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
48f3b6c4247e3b902868b1927ed2e12258f707c9
divverent [Mon, 12 Mar 2012 09:21:55 +0000 (09:21 +0000)]
introducing "scr_loadingscreen_firstforstartup"
make first loading.tga screen a special startup splash-screen,
that shows only once on client startup
From: nyov <nyov@nexnode.net>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11754
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d6f8468a651dc24bae9974b0b37e4d1fb04cacda
divverent [Sat, 10 Mar 2012 12:54:55 +0000 (12:54 +0000)]
dpsoftrast: SHADERMODE_GENERIC SHADERPERMUTATION_ALPHAKILL too
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11753
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
df7b6a445bd6fc238bd55e89bac1b00936459a9d
divverent [Sat, 10 Mar 2012 12:39:29 +0000 (12:39 +0000)]
allow MATERIALFLAG_CAMERA to fade out
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11752
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a88e0e48a46d64181a5891114d0ebb19e1424a9f
divverent [Fri, 9 Mar 2012 19:08:04 +0000 (19:08 +0000)]
try to really fix vectorvectors to be 100% equivalent to makevectors(flippitch(vectoangles(v)))
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11751
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a181d753fe91f86da79cf465b3137738d2cff8b4
vortex [Sat, 18 Feb 2012 12:29:05 +0000 (12:29 +0000)]
VectorVectors: renormalize 'up' vector as it seems to be unnormalized in some cases (a test case - spawning of large-scaled oriented particle).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11697
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
52e4991331e72a3fb72e04e04608b99dc4bb1837
havoc [Mon, 20 Feb 2012 19:36:01 +0000 (19:36 +0000)]
fix the compiler error fo' reals this time
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11715
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
adb9a33dfaac81c66018d05b9024f174c5009ea5
havoc [Mon, 20 Feb 2012 19:34:16 +0000 (19:34 +0000)]
fix compile error
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11713
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e5e211b7bbd7750e5b63e7034cbb0a7704decece
havoc [Mon, 20 Feb 2012 19:21:23 +0000 (19:21 +0000)]
added Q1 BSP2 format support, compatible with hmap2
Q1BSP loader is now based on MSG_Read functions to make it very
extensible
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11711
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ae946773a0fdc85c9fcd22615744a9b0e1b1b0c0
eihrul [Mon, 16 Jan 2012 21:33:09 +0000 (21:33 +0000)]
flip dpsoftrast's texture memory layout so it matches the framebuffer orientation (allows r_viewfbo and r_bloom to work)
however, r_viewfbo and r_bloom in combination are still broken on GPUs/dpsoftrast without non-power-of-2 textures due to not matching the position DP's bloom expects them to be located at
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11649
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e362fefcd05e3d1c5a8e5987916085de5cc368c5
havoc [Fri, 9 Mar 2012 04:48:36 +0000 (04:48 +0000)]
patch from Klaus Silveira cleaning up several inefficient and redundant
code bits
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11749
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f7b537c4d6f704b272a66041e03927c4bdecc40c
havoc [Fri, 9 Mar 2012 04:48:02 +0000 (04:48 +0000)]
fixed a severely bugged check of R_BlendFuncFlags
removed a redundant lightmap update loop
thanks to Klaus Silveira for pointing out these issues
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11748
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1b2f7e565129f79901e2b4d82954aca65e4d1b5e
havoc [Thu, 23 Feb 2012 12:17:32 +0000 (12:17 +0000)]
use stickmouse code when SDL2 relative mouse fails
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11724
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
669303ac431ea39cf7ca49bb6e4a014ba880db0d
havoc [Thu, 23 Feb 2012 12:06:18 +0000 (12:06 +0000)]
work with SDL2
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11723
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f3819a7c9c0568b841fa436329ee7eee2c2aa793
havoc [Fri, 9 Mar 2012 04:25:25 +0000 (04:25 +0000)]
use CFLAGS_ODE on prvm_cmd.c because it checks ODE_DYNAMIC and ODE_STATIC defines
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11747
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5f6013df0acabebeb17602e8824f4e450d010d9f
havoc [Fri, 9 Mar 2012 04:22:41 +0000 (04:22 +0000)]
fix compile error where no extern was defined for ode_dll
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11746
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4055aa1e351f1d3b6f5aac410985717c6e0b2de1
divverent [Thu, 8 Mar 2012 14:01:06 +0000 (14:01 +0000)]
fix checkextension based ODE detection for QC code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11744
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cac5110c0039ca108a000feeb32771979100a3e9
eihrul [Sat, 11 Feb 2012 18:28:01 +0000 (18:28 +0000)]
dual quat -> matrix optimizations
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11681
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bd1cb1e7981ed1b27d1139b258a162d087c2deb4
eihrul [Sat, 11 Feb 2012 17:43:20 +0000 (17:43 +0000)]
fix multiply for skeleton objects
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11680
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4c835bb616ed0655c5b21886819b04ba6cb8d6e2
eihrul [Sat, 11 Feb 2012 17:25:12 +0000 (17:25 +0000)]
skeleton object openglorientation fix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11679
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3c2d90403b205234bbffdce54a718f35d663c717
eihrul [Sat, 11 Feb 2012 17:16:42 +0000 (17:16 +0000)]
SIMD-ize the matrix multiplication in AnimateVertices
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11678
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2c30f5052906b5e757943960df52879dcc3e37a3
eihrul [Tue, 7 Feb 2012 17:15:36 +0000 (17:15 +0000)]
spaces -> tabs
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11670
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
401cf2cba4a3d13c52ef4d2080e8cc5ce3b45682
eihrul [Tue, 7 Feb 2012 17:13:12 +0000 (17:13 +0000)]
use dual quaternions for frame blends
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11669
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5510209526793ea40c1a010926f134913ddfecc3
eihrul [Sat, 4 Feb 2012 19:42:46 +0000 (19:42 +0000)]
convert pose6s data to pose7s data to resolve quaternion W coordinate precision issues
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11667
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4e917c714cb66459bc448d983a45d57b616bb154
divverent [Thu, 1 Mar 2012 14:34:32 +0000 (14:34 +0000)]
add a flag to forcibly turn off skeletal animation for benchmarking
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11740
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
1de993e0adc134a70e683ee75a0e4f64117dfa5e
havoc [Mon, 27 Feb 2012 18:31:30 +0000 (18:31 +0000)]
fix for .alpha and other effects on sprites that use the same frame,
they were all reusing the same alpha value, probably also broke
interpolation at the same time
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11735
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8dc32923fc2d7d54c02c1b7646fdb2c5fce858b1
divverent [Thu, 1 Mar 2012 13:32:55 +0000 (13:32 +0000)]
Con_ClearNotify: only hide notify, not chat
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11739
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
83b5a04f723e6cfa927033719685fe3a8da72ba7
divverent [Tue, 28 Feb 2012 11:52:14 +0000 (11:52 +0000)]
fix a stupid type error.
Why doesn't PRVM_EDICT_NUM(prvm_edict_t *) warn?!?
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11737
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a7204e2f520d5d5b06302923ac7c359066401f04
divverent [Tue, 28 Feb 2012 11:06:10 +0000 (11:06 +0000)]
runstandardplayerphysics: ignore the passed edict for player physics (consistent to legacy prediction)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11736
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
22e2d9b2dfe473fce6580cbe4fd191850eddd687
havoc [Sun, 26 Feb 2012 15:06:40 +0000 (15:06 +0000)]
byteswap S16LE sound data on load once, not twice :)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11734
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e25e94b0f38884e38eb25b5c2a2c59084af68800
divverent [Fri, 24 Feb 2012 14:43:49 +0000 (14:43 +0000)]
remove redundant check
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11730
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8a185be15ae1bea0bbb2b5857bbc1794675b75a8
divverent [Fri, 24 Feb 2012 14:42:30 +0000 (14:42 +0000)]
don't accumulate time reports for the first 10 seconds of a match so things can settle
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11729
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
aa18f6ecab09516f2af3bf710fc4c9090634d3c3