]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
12 years agofix a typo
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

12 years agoPRVM_64: make savegames precision-loss-less
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

12 years agofix "strings go past end of file" check
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

12 years agofix PRVM_E_INT which was severely bugged
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

12 years agouse prvm_vec_t for spawn_parms storage
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

12 years agoenable PRVM_64 define
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

12 years agoadded PRVM_64 define which upgrades the QC VM to double precision
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

12 years agoproperly check for bloom being active
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

12 years agoCreate a cvar which changes brightness when r_bloom is enabled. This is useful to...
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

12 years agoput comment about wrong cppcheck warning (apparently got confused about scope of...
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

12 years agofix out of buffer access in snd_3dras
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

12 years agoset right include path for two #include commands
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

12 years agoanother NULL dereference fixed
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

12 years agoremove pointless NULL checks in gl_rmain as they can never hit without code crashing...
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

12 years agoslightly simplify cmd and cvar code (also silences a - false - cppcheck error)
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

12 years agofix NULL dereference in jam and avw video playback when out of memory
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

12 years agofix a NULL pointer dereference in modeldecompile
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

12 years agoworkaround bad whitespace commit
Rudolf Polzer [Sun, 1 Apr 2012 09:42:28 +0000 (11:42 +0200)]
workaround bad whitespace commit

12 years agoFIX LINEFEEDS :(
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

12 years agoTurn off RFC 1149 on systems that have it enabled.
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

12 years agoR_Shadow_CullFrustumSide fixes
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

12 years agohush more warnings
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

12 years agomark some functions as static to hush warnings
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

12 years agoimplemented collision_triangle_axialsides cvar (default 1, matching
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

12 years agofixed compilation on MSVS2008 - do not use stdint.h
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

12 years agor_editlights: added r_editlights_drawproperties cvar and read-only cvars for selected...
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

12 years agoWork-in-progress extension: DP_QC_STRINGBUFFERS_EXT_WIP.
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

12 years agoIntroducing LibAvW - a wrapper DLL to play videos using libav. Basic support includes...
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

12 years agocl_particles_reloadeffects <filename> - reload effects from custom effect file
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

12 years agocheckpvs: use the right worldmodel
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

12 years agodocument that celshading and celoutlines currently require GL2
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

12 years agoremove some undesired else's that break r_celshading and r_celoutlines
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

12 years agofix typos
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

12 years agoadded r_celshading cvar and GLSL shader code
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

12 years agoVM_FrameBlendFromFrameGroupBlend was using cl.time even on server
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

12 years agofix usage of linear filter when using shadowmap sampler
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

12 years agofix a typo in challenge flood protection
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

12 years agofix an unlikely crypto downgrade attack found during audit
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

12 years agoalso block floods of getstatus, getinfo, getchallenge
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

12 years agouse prog->progs_mempool for server DP_SKELETONOBJECTS storage, not
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

12 years agointroducing "scr_loadingscreen_firstforstartup"
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

12 years agodpsoftrast: SHADERMODE_GENERIC SHADERPERMUTATION_ALPHAKILL too
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

12 years agoallow MATERIALFLAG_CAMERA to fade out
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

12 years agotry to really fix vectorvectors to be 100% equivalent to makevectors(flippitch(vectoa...
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

12 years agoVectorVectors: renormalize 'up' vector as it seems to be unnormalized in some cases...
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

12 years agofix the compiler error fo' reals this time
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

12 years agofix compile error
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

12 years agoadded Q1 BSP2 format support, compatible with hmap2
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

12 years agoflip dpsoftrast's texture memory layout so it matches the framebuffer orientation...
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

12 years agopatch from Klaus Silveira cleaning up several inefficient and redundant
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

12 years agofixed a severely bugged check of R_BlendFuncFlags
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

12 years agouse stickmouse code when SDL2 relative mouse fails
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

12 years agowork with SDL2
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

12 years agouse CFLAGS_ODE on prvm_cmd.c because it checks ODE_DYNAMIC and ODE_STATIC defines
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

12 years agofix compile error where no extern was defined for ode_dll
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

12 years agofix checkextension based ODE detection for QC code
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

12 years agodual quat -> matrix optimizations
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

12 years agofix multiply for skeleton objects
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

12 years agoskeleton object openglorientation fix
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

12 years agoSIMD-ize the matrix multiplication in AnimateVertices
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

12 years agospaces -> tabs
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

12 years agouse dual quaternions for frame blends
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

12 years agoconvert pose6s data to pose7s data to resolve quaternion W coordinate precision issues
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

12 years agoadd a flag to forcibly turn off skeletal animation for benchmarking xonotic-v0.6.0
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

12 years agofix for .alpha and other effects on sprites that use the same frame,
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

12 years agoCon_ClearNotify: only hide notify, not chat
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

12 years agofix a stupid type error.
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

12 years agorunstandardplayerphysics: ignore the passed edict for player physics (consistent...
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

12 years agobyteswap S16LE sound data on load once, not twice :)
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

12 years agoremove redundant check
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

12 years agodon't accumulate time reports for the first 10 seconds of a match so things can settle
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

12 years agoadd missing variable
divverent [Fri, 24 Feb 2012 13:34:16 +0000 (13:34 +0000)]
add missing variable

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

12 years agoalso count timing info when nobody is playing
divverent [Fri, 24 Feb 2012 12:28:41 +0000 (12:28 +0000)]
also count timing info when nobody is playing

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

12 years agouse both .items2 and serverflags in items stat, to finally fix the runes
havoc [Tue, 21 Feb 2012 19:21:05 +0000 (19:21 +0000)]
use both .items2 and serverflags in items stat, to finally fix the runes
missing on the hud bug

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

12 years agoI moved the IPv6 master server to another server. Sorry for that.
divverent [Thu, 23 Feb 2012 10:35:46 +0000 (10:35 +0000)]
I moved the IPv6 master server to another server. Sorry for that.

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

12 years agofix a stupid typo
divverent [Tue, 21 Feb 2012 12:03:12 +0000 (12:03 +0000)]
fix a stupid typo

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

12 years agono need to waste a full page
divverent [Tue, 21 Feb 2012 11:49:25 +0000 (11:49 +0000)]
no need to waste a full page

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

12 years agocrazy feature: -DFILE_BASED_MALLOC=1
divverent [Tue, 21 Feb 2012 11:32:57 +0000 (11:32 +0000)]
crazy feature: -DFILE_BASED_MALLOC=1

replaces malloc/free calls by mmap/munmap of file backed store.

Best used with -DMEMCLUMPING=1

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

12 years agowe don't use DGA any more, so why -lxxf86dga
divverent [Mon, 20 Feb 2012 19:25:50 +0000 (19:25 +0000)]
we don't use DGA any more, so why -lxxf86dga

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

12 years agoadd a note about a VectorVectors bug
divverent [Mon, 20 Feb 2012 15:11:32 +0000 (15:11 +0000)]
add a note about a VectorVectors bug

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

12 years agofix broken use of + and | in drawflags
divverent [Mon, 20 Feb 2012 14:54:40 +0000 (14:54 +0000)]
fix broken use of + and | in drawflags

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

12 years agofix a crash when JPEG loading when alpha image is corrupt
divverent [Mon, 20 Feb 2012 12:28:09 +0000 (12:28 +0000)]
fix a crash when JPEG loading when alpha image is corrupt

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

12 years agoFix shader compile log again. Print error in any case, warnings only if developer...
vortex [Sun, 19 Feb 2012 00:43:54 +0000 (00:43 +0000)]
Fix shader compile log again. Print error in any case, warnings only if developer, all other if developer_extra.

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

12 years agoFixed shader compile log to use Con_DPrintf.
vortex [Sat, 18 Feb 2012 22:09:50 +0000 (22:09 +0000)]
Fixed shader compile log to use Con_DPrintf.

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

12 years agoODE: rewrite scale support to scale collision mesh. Now mass center and object bounds...
vortex [Sat, 18 Feb 2012 19:30:20 +0000 (19:30 +0000)]
ODE: rewrite scale support to scale collision mesh. Now mass center and object bounds is derived from real collision mesh box, not model/entity box. Added experimental code for Convex Hull geometry (off by default). Also autodisabling was fixed to exclude collisions between disabled objects which gives a huge speedup on dCollide* phase. Increased defaults for damping and autodisable.
Matrixlib: removed  Matrix4x4_OriginScale3 which was added for ODE offsetmatrix scale, since it's not used by it anymore, its removed.

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

12 years agoalways allow -nosse and -nosse2 flags to change SSE status
divverent [Sat, 18 Feb 2012 13:48:09 +0000 (13:48 +0000)]
always allow -nosse and -nosse2 flags to change SSE status

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

12 years agoAdd an optional DRAW_NOGAMMA flag for R_DrawQSuperPic (disable glslgamma for that...
vortex [Sat, 18 Feb 2012 10:23:32 +0000 (10:23 +0000)]
Add an optional DRAW_NOGAMMA flag for R_DrawQSuperPic (disable glslgamma for that pic).
r_texture_dds_load_logfailure: 1 only prints required diffuse textures, 2 keeps old behavior - prints all missing textures (including normalmap, gloss, pants, shirt, mask.

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

12 years agoactually fix the barrier typecasts... these really need to be volatile due to the...
divverent [Sat, 18 Feb 2012 11:19:13 +0000 (11:19 +0000)]
actually fix the barrier typecasts... these really need to be volatile due to the b->called counter

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

12 years agofix type cast
vortex [Sat, 18 Feb 2012 10:05:58 +0000 (10:05 +0000)]
fix type cast

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

12 years agofix type cast
vortex [Sat, 18 Feb 2012 10:04:23 +0000 (10:04 +0000)]
fix type cast

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

12 years agoAdd support for barriers to the threading interface; fix skeletal animation appearing...
divverent [Thu, 16 Feb 2012 21:04:22 +0000 (21:04 +0000)]
Add support for barriers to the threading interface; fix skeletal animation appearing as part of visibility in r_speeds 2

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

12 years agomake sure depth test is disabled before rendering bloom
eihrul [Sun, 12 Feb 2012 20:30:58 +0000 (20:30 +0000)]
make sure depth test is disabled before rendering bloom

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

12 years agofix some weird incidental finding in the bloom code
eihrul [Sun, 12 Feb 2012 20:17:59 +0000 (20:17 +0000)]
fix some weird incidental finding in the bloom code

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

12 years agoalso support 1.2 again
divverent [Sun, 12 Feb 2012 08:42:00 +0000 (08:42 +0000)]
also support 1.2 again

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

12 years agoimplement the libpng longjmp hack properly. png_jmpbuf is actually a macro!
divverent [Sun, 12 Feb 2012 08:23:43 +0000 (08:23 +0000)]
implement the libpng longjmp hack properly. png_jmpbuf is actually a macro!

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

12 years agobring back old glibc workaround
divverent [Sun, 12 Feb 2012 08:16:11 +0000 (08:16 +0000)]
bring back old glibc workaround

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

12 years agofix jump buffer type
divverent [Sun, 12 Feb 2012 08:14:26 +0000 (08:14 +0000)]
fix jump buffer type

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

12 years agoadded cvars r_nearest_2d and r_nearest_conchars which let you force all
havoc [Sat, 4 Feb 2012 09:46:50 +0000 (09:46 +0000)]
added cvars r_nearest_2d and r_nearest_conchars which let you force all
2d pics (including conchars) to nearest filtering, or just conchars

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

12 years agochange mdl texcoord loading to not have a .5 pixel offset, this now
havoc [Thu, 26 Jan 2012 16:35:07 +0000 (16:35 +0000)]
change mdl texcoord loading to not have a .5 pixel offset, this now
matches winquake (complete top row and left column are used, bottom row
and right column are not because the texcoords would be off the skin)

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

12 years agosupport libpng 1.5.0
divverent [Sat, 11 Feb 2012 15:55:36 +0000 (15:55 +0000)]
support libpng 1.5.0

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