]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
12 years agoallow GET requests to be signed too (typo fix)
divverent [Tue, 7 Feb 2012 22:17:32 +0000 (22:17 +0000)]
allow GET requests to be signed too (typo fix)

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

12 years agomoved S_FreeSfx call in S_StopChannel to be in a safer place
havoc [Tue, 31 Jan 2012 22:36:33 +0000 (22:36 +0000)]
moved S_FreeSfx call in S_StopChannel to be in a safer place

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

12 years agofix a compile error; don't reallocate if target is same size (not sure if that can...
divverent [Tue, 31 Jan 2012 08:49:09 +0000 (08:49 +0000)]
fix a compile error; don't reallocate if target is same size (not sure if that can ever happen though)

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

12 years agoensure texture is not null before adjusting bind counter
eihrul [Mon, 30 Jan 2012 21:50:20 +0000 (21:50 +0000)]
ensure texture is not null before adjusting bind counter

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

12 years agoproperly handle !vid.support.arb_texture_non_power_of_two in DDS upload (fixes segfau...
divverent [Mon, 30 Jan 2012 21:39:54 +0000 (21:39 +0000)]
properly handle !vid.support.arb_texture_non_power_of_two in DDS upload (fixes segfault with dpsoftrast in xonotic effects-low.cfg)

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

12 years agoremove a confusing #if
havoc [Sat, 28 Jan 2012 17:59:05 +0000 (17:59 +0000)]
remove a confusing #if

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

12 years agofix avgcolor calculation when loading dds
divverent [Thu, 26 Jan 2012 17:24:57 +0000 (17:24 +0000)]
fix avgcolor calculation when loading dds

Fixes "black screen with r_showsurfaces 3" bug

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

12 years agoremove PRECACHE_PIC_NOCLAMP because it currently has no chance to work
divverent [Tue, 24 Jan 2012 21:47:10 +0000 (21:47 +0000)]
remove PRECACHE_PIC_NOCLAMP because it currently has no chance to work

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

12 years agoRevert "don't compare texflags in Draw_CachePic_Flags simply because usage of pics...
divverent [Tue, 24 Jan 2012 21:47:07 +0000 (21:47 +0000)]
Revert "don't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn't have a way to specify the flags you want, so "anything matches" is a good strategy here" because I just noticed it was a bad idea (R_BeginPolygon vs line drawing).

This reverts commit b561aa07fda3f8aef74c4e4799ea81ef8c479e2a.

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

12 years agodon't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn...
divverent [Tue, 24 Jan 2012 21:45:05 +0000 (21:45 +0000)]
don't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn't have a way to specify the flags you want, so "anything matches" is a good strategy here

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

12 years agoupdate dpdefs; support flags to precache_pic
divverent [Tue, 24 Jan 2012 21:28:53 +0000 (21:28 +0000)]
update dpdefs; support flags to precache_pic

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

12 years agoremove PRECACHE_PIC_NOCLAMP because it currently has no chance to work
divverent [Tue, 24 Jan 2012 21:47:10 +0000 (21:47 +0000)]
remove PRECACHE_PIC_NOCLAMP because it currently has no chance to work

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

12 years agoRevert "don't compare texflags in Draw_CachePic_Flags simply because usage of pics...
divverent [Tue, 24 Jan 2012 21:47:07 +0000 (21:47 +0000)]
Revert "don't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn't have a way to specify the flags you want, so "anything matches" is a good strategy here" because I just noticed it was a bad idea (R_BeginPolygon vs line drawing).

This reverts commit b561aa07fda3f8aef74c4e4799ea81ef8c479e2a.

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

12 years agodon't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn...
divverent [Tue, 24 Jan 2012 21:45:05 +0000 (21:45 +0000)]
don't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn't have a way to specify the flags you want, so "anything matches" is a good strategy here

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

12 years agoadd a (yet unused) CACHEPICFLAG_MIPMAP
divverent [Tue, 24 Jan 2012 20:41:27 +0000 (20:41 +0000)]
add a (yet unused) CACHEPICFLAG_MIPMAP

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

12 years agomod_obj_orientation: affect modeldecompile too
divverent [Tue, 24 Jan 2012 20:41:31 +0000 (20:41 +0000)]
mod_obj_orientation: affect modeldecompile too

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

12 years agoUNMERGE! flip dpsoftrast's texture memory layout so it matches the framebuffer orient...
eihrul [Mon, 16 Jan 2012 21:33:09 +0000 (21:33 +0000)]
UNMERGE! 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::unmerge=e362fefcd05e3d1c5a8e5987916085de5cc368c5

12 years agoWORKAROUND: turn off vid.support.ext_framebuffer_object if nonpoweroftwo is not suppo...
divverent [Sun, 22 Jan 2012 21:01:16 +0000 (21:01 +0000)]
WORKAROUND: turn off vid.support.ext_framebuffer_object if nonpoweroftwo is not supported because FBO rendering with non-npot is currently massively broken

Please revert this commit when fixing the issue.

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

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 agoRevert "note that in some cases, crypto_aeslevel changes need crypto_reload to apply...
divverent [Thu, 19 Jan 2012 22:51:21 +0000 (22:51 +0000)]
Revert "note that in some cases, crypto_aeslevel changes need crypto_reload to apply (namely, for the server info string)" because I am stupid, this is already solved by code editing the first character

This reverts commit 9a55aaeb89cf823297d40821f9558daed16c87f1.

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

12 years agonote that in some cases, crypto_aeslevel changes need crypto_reload to apply (namely...
divverent [Thu, 19 Jan 2012 22:50:29 +0000 (22:50 +0000)]
note that in some cases, crypto_aeslevel changes need crypto_reload to apply (namely, for the server info string)

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

12 years agobetter ATI detection
eihrul [Sat, 14 Jan 2012 12:18:57 +0000 (12:18 +0000)]
better ATI detection

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

12 years agoworkaround for upside down bug in dpsoftrast: turn off FBO support for dpsoftrast
divverent [Mon, 16 Jan 2012 09:19:27 +0000 (09:19 +0000)]
workaround for upside down bug in dpsoftrast: turn off FBO support for dpsoftrast

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

12 years agooffsetmapping LOD: at least 3 steps!
divverent [Sun, 15 Jan 2012 15:18:32 +0000 (15:18 +0000)]
offsetmapping LOD: at least 3 steps!

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

12 years agofix scale issue with offsetmapping LOD due to calculated fractional steps count
divverent [Sun, 15 Jan 2012 14:14:19 +0000 (14:14 +0000)]
fix scale issue with offsetmapping LOD due to calculated fractional steps count

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

12 years agoforce a send if movesequence changed
divverent [Mon, 9 Jan 2012 20:02:47 +0000 (20:02 +0000)]
force a send if movesequence changed

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

12 years agofix c/s consistency of sv_gameplayfix_nogravityonground and sv_gameplayfix_gravityuna...
divverent [Mon, 9 Jan 2012 15:12:09 +0000 (15:12 +0000)]
fix c/s consistency of sv_gameplayfix_nogravityonground and sv_gameplayfix_gravityunaffectedbyticrate

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

12 years agoadd a missing line from the previous commit
divverent [Mon, 9 Jan 2012 13:32:43 +0000 (13:32 +0000)]
add a missing line from the previous commit

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

12 years agofix issues with V_CalcRefdef in CSQC and stereo view
divverent [Mon, 9 Jan 2012 13:29:32 +0000 (13:29 +0000)]
fix issues with V_CalcRefdef in CSQC and stereo view

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

12 years agofix c/s consistency of sv_gameplayfix_nogravityonground and sv_gameplayfix_gravityuna...
divverent [Mon, 9 Jan 2012 15:12:09 +0000 (15:12 +0000)]
fix c/s consistency of sv_gameplayfix_nogravityonground and sv_gameplayfix_gravityunaffectedbyticrate

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

12 years agoadd a missing line from the previous commit
divverent [Mon, 9 Jan 2012 13:32:43 +0000 (13:32 +0000)]
add a missing line from the previous commit

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

12 years agofix issues with V_CalcRefdef in CSQC and stereo view
divverent [Mon, 9 Jan 2012 13:29:32 +0000 (13:29 +0000)]
fix issues with V_CalcRefdef in CSQC and stereo view

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

12 years agouse a param for velocity too
divverent [Mon, 9 Jan 2012 12:30:23 +0000 (12:30 +0000)]
use a param for velocity too

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

12 years agofix a typo, removing use of cl.viewangles
divverent [Mon, 9 Jan 2012 12:30:20 +0000 (12:30 +0000)]
fix a typo, removing use of cl.viewangles

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

12 years agoadd TODO markers, possibly for WIP3 version of V_CalcRefdef extension
divverent [Mon, 9 Jan 2012 12:30:17 +0000 (12:30 +0000)]
add TODO markers, possibly for WIP3 version of V_CalcRefdef extension

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

12 years agoDP_CSQC_V_CALCREFDEF_WIP2
divverent [Mon, 9 Jan 2012 12:17:11 +0000 (12:17 +0000)]
DP_CSQC_V_CALCREFDEF_WIP2

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

12 years agoadd viewmodel info too
divverent [Mon, 9 Jan 2012 12:17:07 +0000 (12:17 +0000)]
add viewmodel info too

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

12 years agoVectorCopy vieworg and viewangles in intermission too
divverent [Mon, 9 Jan 2012 11:18:23 +0000 (11:18 +0000)]
VectorCopy vieworg and viewangles in intermission too

From: Samual <samual@xonotic.org>

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

12 years agoTry fix ode_body cast.
vortex [Sat, 31 Dec 2011 17:11:35 +0000 (17:11 +0000)]
Try fix ode_body cast.

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

12 years agoODE stuff:
vortex [Sat, 31 Dec 2011 09:53:16 +0000 (09:53 +0000)]
ODE stuff:
1) Cleaned up capsule/cylinder setup code. New geomtypes - axis-oriented cylinder (x, y, z) and capsule, the only difference from original cylinder/capsule is that leading axis is fixed for these types, allowing to set cylinder with length lesser than diameter. Axis oriented
capsule is not that useful (as there is no capsule which height is lesser than radius, so it's going to fix radius to match), but could be useful is some cases.
2) GEOMTYPE_TRIMESH now supports .scale and .modelscale_vec (q3map2's per-axis scale).
3) New cvar physics_ode_contact_maxpoints (default 16, can be up to 32) to control default maximum number of contact points between two objects, and new .maxcontacts entity field to control maximum number of contacts it could have with other entities, setting it to low value (5 or 10) gains speed with large stacks of GEOMTYPE_TRIMESH, but makes collision more grude, use it on debris and such stuff.
4) At engine startup, print configuration (extensions string) ODE was built with.
5) physics_ode_constantstep is rewritten to do what actually it should do - it tries to run physics with constant time step, making more ODE iterations to match frametime. So it allows to run physics at 50 FPS, 100 fps no matter what rendering fps are, with some restrictions. physics_ode_iterationsperframe has no effect when using constantstep.
6) New GEOMTYPE_NONE that makes object to be entirely ignored by ODE. Also SOLID_NOT and SOLID_TRIGGER defaults to GEOMTYPE_NONE (if geomtype is 0).
7) Added basic forces in same manner as joints (entities with .forcetype), physics_addforce() and physics_addtorgue() is now deprecated as they cant work with multiple ODE iterations per frame.

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

12 years agoif vertex texture blending is used with a _glow texture, make sure both
havoc [Wed, 4 Jan 2012 04:36:21 +0000 (04:36 +0000)]
if vertex texture blending is used with a _glow texture, make sure both
layers have a valid _glow texture to render with (otherwise substitute
black in their place)

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

12 years agocheck rsurface.texture->backgroundglowtexture as well when deciding
havoc [Wed, 4 Jan 2012 01:23:47 +0000 (01:23 +0000)]
check rsurface.texture->backgroundglowtexture as well when deciding
whether to enable the GLSL code for _glow texture

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

12 years agoUNMERGE! ODE stuff:
vortex [Sat, 31 Dec 2011 09:53:16 +0000 (09:53 +0000)]
UNMERGE! ODE stuff:
1) Cleaned up capsule/cylinder setup code. New geomtypes - axis-oriented cylinder (x, y, z) and capsule, the only difference from original cylinder/capsule is that leading axis is fixed for these types, allowing to set cylinder with length lesser than diameter. Axis oriented
capsule is not that useful (as there is no capsule which height is lesser than radius, so it's going to fix radius to match), but could be useful is some cases.
2) GEOMTYPE_TRIMESH now supports .scale and .modelscale_vec (q3map2's per-axis scale).
3) New cvar physics_ode_contact_maxpoints (default 16, can be up to 32) to control default maximum number of contact points between two objects, and new .maxcontacts entity field to control maximum number of contacts it could have with other entities, setting it to low value (5 or 10) gains speed with large stacks of GEOMTYPE_TRIMESH, but makes collision more grude, use it on debris and such stuff.
4) At engine startup, print configuration (extensions string) ODE was built with.
5) physics_ode_constantstep is rewritten to do what actually it should do - it tries to run physics with constant time step, making more ODE iterations to match frametime. So it allows to run physics at 50 FPS, 100 fps no matter what rendering fps are, with some restrictions. physics_ode_iterationsperframe has no effect when using constantstep.
6) New GEOMTYPE_NONE that makes object to be entirely ignored by ODE. Also SOLID_NOT and SOLID_TRIGGER defaults to GEOMTYPE_NONE (if geomtype is 0).
7) Added basic forces in same manner as joints (entities with .forcetype), physics_addforce() and physics_addtorgue() is now deprecated as they cant work with multiple ODE iterations per frame.

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

12 years agoUNMERGE! Try fix ode_body cast.
vortex [Sat, 31 Dec 2011 17:11:35 +0000 (17:11 +0000)]
UNMERGE! Try fix ode_body cast.

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

12 years ago::stable-branch::reset=d2daf00cd44c7a3be817bfddbf221ff6029f8efb
Rudolf Polzer [Tue, 3 Jan 2012 23:58:28 +0000 (00:58 +0100)]
::stable-branch::reset=d2daf00cd44c7a3be817bfddbf221ff6029f8efb

12 years ago::stable-branch::rebase=d2daf00cd44c7a3be817bfddbf221ff6029f8efb
Rudolf Polzer [Tue, 3 Jan 2012 23:51:15 +0000 (00:51 +0100)]
::stable-branch::rebase=d2daf00cd44c7a3be817bfddbf221ff6029f8efb

12 years agoargh, sorry for broken copypasta
divverent [Tue, 3 Jan 2012 22:07:54 +0000 (22:07 +0000)]
argh, sorry for broken copypasta

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

12 years agoargh, sorry for broken copypasta
divverent [Tue, 3 Jan 2012 22:07:54 +0000 (22:07 +0000)]
argh, sorry for broken copypasta

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11632 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoFix compile error for VM_getimagesize
Samual [Tue, 3 Jan 2012 19:21:00 +0000 (14:21 -0500)]
Fix compile error for VM_getimagesize

12 years agogetimagesize(): return '0 0 0' for missing texture (previously the size of the notext...
divverent [Tue, 3 Jan 2012 16:32:45 +0000 (16:32 +0000)]
getimagesize(): return '0 0 0' for missing texture (previously the size of the notexture, that is, '16 16 0')

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11631 d7cf8633-e32d-0410-b094-e92efae38249

12 years agogetimagesize(): return '0 0 0' for missing texture (previously the size of the notext...
divverent [Tue, 3 Jan 2012 16:32:45 +0000 (16:32 +0000)]
getimagesize(): return '0 0 0' for missing texture (previously the size of the notexture, that is, '16 16 0')

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

12 years agoallow control over User-Agent:
divverent [Tue, 3 Jan 2012 12:00:40 +0000 (12:00 +0000)]
allow control over User-Agent:

cl_curl_useragent 0 turns it off
-DHTTP_USER_AGENT="Foo" overrides the engineversion part
cl_curl_useragent_append bar appends stuff ("Foo bar")

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

12 years agoallow control over User-Agent:
divverent [Tue, 3 Jan 2012 12:00:40 +0000 (12:00 +0000)]
allow control over User-Agent:

cl_curl_useragent 0 turns it off
-DHTTP_USER_AGENT="Foo" overrides the engineversion part
cl_curl_useragent_append bar appends stuff ("Foo bar")

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11630 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoTry fix ode_body cast.
vortex [Sat, 31 Dec 2011 17:11:35 +0000 (17:11 +0000)]
Try fix ode_body cast.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11629 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoEF_DYNAMICMODELLIGHT
divverent [Sat, 31 Dec 2011 13:32:02 +0000 (13:32 +0000)]
EF_DYNAMICMODELLIGHT

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

12 years agoUNMERGE! ODE stuff:
vortex [Sat, 31 Dec 2011 09:53:16 +0000 (09:53 +0000)]
UNMERGE! ODE stuff:
1) Cleaned up capsule/cylinder setup code. New geomtypes - axis-oriented cylinder (x, y, z) and capsule, the only difference from original cylinder/capsule is that leading axis is fixed for these types, allowing to set cylinder with length lesser than diameter. Axis oriented
capsule is not that useful (as there is no capsule which height is lesser than radius, so it's going to fix radius to match), but could be useful is some cases.
2) GEOMTYPE_TRIMESH now supports .scale and .modelscale_vec (q3map2's per-axis scale).
3) New cvar physics_ode_contact_maxpoints (default 16, can be up to 32) to control default maximum number of contact points between two objects, and new .maxcontacts entity field to control maximum number of contacts it could have with other entities, setting it to low value (5 or 10) gains speed with large stacks of GEOMTYPE_TRIMESH, but makes collision more grude, use it on debris and such stuff.
4) At engine startup, print configuration (extensions string) ODE was built with.
5) physics_ode_constantstep is rewritten to do what actually it should do - it tries to run physics with constant time step, making more ODE iterations to match frametime. So it allows to run physics at 50 FPS, 100 fps no matter what rendering fps are, with some restrictions. physics_ode_iterationsperframe has no effect when using constantstep.
6) New GEOMTYPE_NONE that makes object to be entirely ignored by ODE. Also SOLID_NOT and SOLID_TRIGGER defaults to GEOMTYPE_NONE (if geomtype is 0).
7) Added basic forces in same manner as joints (entities with .forcetype), physics_addforce() and physics_addtorgue() is now deprecated as they cant work with multiple ODE iterations per frame.

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

12 years agoEF_DYNAMICMODELLIGHT
divverent [Sat, 31 Dec 2011 13:32:02 +0000 (13:32 +0000)]
EF_DYNAMICMODELLIGHT

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11628 d7cf8633-e32d-0410-b094-e92efae38249

12 years agofix a typo in V_CalcRefdef regarding csqc view entities
divverent [Sat, 31 Dec 2011 12:19:58 +0000 (12:19 +0000)]
fix a typo in V_CalcRefdef regarding csqc view entities

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11627 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoODE stuff:
vortex [Sat, 31 Dec 2011 09:53:16 +0000 (09:53 +0000)]
ODE stuff:
1) Cleaned up capsule/cylinder setup code. New geomtypes - axis-oriented cylinder (x, y, z) and capsule, the only difference from original cylinder/capsule is that leading axis is fixed for these types, allowing to set cylinder with length lesser than diameter. Axis oriented
capsule is not that useful (as there is no capsule which height is lesser than radius, so it's going to fix radius to match), but could be useful is some cases.
2) GEOMTYPE_TRIMESH now supports .scale and .modelscale_vec (q3map2's per-axis scale).
3) New cvar physics_ode_contact_maxpoints (default 16, can be up to 32) to control default maximum number of contact points between two objects, and new .maxcontacts entity field to control maximum number of contacts it could have with other entities, setting it to low value (5 or 10) gains speed with large stacks of GEOMTYPE_TRIMESH, but makes collision more grude, use it on debris and such stuff.
4) At engine startup, print configuration (extensions string) ODE was built with.
5) physics_ode_constantstep is rewritten to do what actually it should do - it tries to run physics with constant time step, making more ODE iterations to match frametime. So it allows to run physics at 50 FPS, 100 fps no matter what rendering fps are, with some restrictions. physics_ode_iterationsperframe has no effect when using constantstep.
6) New GEOMTYPE_NONE that makes object to be entirely ignored by ODE. Also SOLID_NOT and SOLID_TRIGGER defaults to GEOMTYPE_NONE (if geomtype is 0).
7) Added basic forces in same manner as joints (entities with .forcetype), physics_addforce() and physics_addtorgue() is now deprecated as they cant work with multiple ODE iterations per frame.

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

12 years agofix a typo in V_CalcRefdef regarding csqc view entities
divverent [Sat, 31 Dec 2011 12:19:58 +0000 (12:19 +0000)]
fix a typo in V_CalcRefdef regarding csqc view entities

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

12 years agosome fixes for dpdefs
divverent [Fri, 30 Dec 2011 20:11:07 +0000 (20:11 +0000)]
some fixes for dpdefs

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

12 years agochange GAME_STEELSTORM2 to be after GAME_STEELSTORM again
havoc [Wed, 28 Dec 2011 04:11:29 +0000 (04:11 +0000)]
change GAME_STEELSTORM2 to be after GAME_STEELSTORM again

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

12 years agoswap order of GAME_STEELSTORM and GAME_STEELSTORM2 in detection list
havoc [Wed, 28 Dec 2011 02:46:39 +0000 (02:46 +0000)]
swap order of GAME_STEELSTORM and GAME_STEELSTORM2 in detection list

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

12 years agoCumulative patch:
vortex [Wed, 21 Dec 2011 15:20:10 +0000 (15:20 +0000)]
Cumulative patch:
Fix RF_MODELLIGHT (was broken and dont work same way engine does it).
Fix bug in physics_ode_constantstep 1 (integer division, huh).
Added new geomtype field for ODE physics - sets collision shape, SOLID_PHYSICS_ are not deprecated (but keeped for compatibility reasons), as geomtype is a more correct way to set collision shape (allows to set both SOLID_CORPSE and trimesh collisions for instance).
Fixed support of custinfoparms.txt as some recent change in shader code seemed to broke it.

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

12 years agoODE stuff:
vortex [Sat, 31 Dec 2011 09:53:16 +0000 (09:53 +0000)]
ODE stuff:
1) Cleaned up capsule/cylinder setup code. New geomtypes - axis-oriented cylinder (x, y, z) and capsule, the only difference from original cylinder/capsule is that leading axis is fixed for these types, allowing to set cylinder with length lesser than diameter. Axis oriented
capsule is not that useful (as there is no capsule which height is lesser than radius, so it's going to fix radius to match), but could be useful is some cases.
2) GEOMTYPE_TRIMESH now supports .scale and .modelscale_vec (q3map2's per-axis scale).
3) New cvar physics_ode_contact_maxpoints (default 16, can be up to 32) to control default maximum number of contact points between two objects, and new .maxcontacts entity field to control maximum number of contacts it could have with other entities, setting it to low value (5 or 10) gains speed with large stacks of GEOMTYPE_TRIMESH, but makes collision more grude, use it on debris and such stuff.
4) At engine startup, print configuration (extensions string) ODE was built with.
5) physics_ode_constantstep is rewritten to do what actually it should do - it tries to run physics with constant time step, making more ODE iterations to match frametime. So it allows to run physics at 50 FPS, 100 fps no matter what rendering fps are, with some restrictions. physics_ode_iterationsperframe has no effect when using constantstep.
6) New GEOMTYPE_NONE that makes object to be entirely ignored by ODE. Also SOLID_NOT and SOLID_TRIGGER defaults to GEOMTYPE_NONE (if geomtype is 0).
7) Added basic forces in same manner as joints (entities with .forcetype), physics_addforce() and physics_addtorgue() is now deprecated as they cant work with multiple ODE iterations per frame.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11626 d7cf8633-e32d-0410-b094-e92efae38249

12 years agosome fixes for dpdefs
divverent [Fri, 30 Dec 2011 20:11:07 +0000 (20:11 +0000)]
some fixes for dpdefs

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11625 d7cf8633-e32d-0410-b094-e92efae38249

12 years agochange GAME_STEELSTORM2 to be after GAME_STEELSTORM again
havoc [Wed, 28 Dec 2011 04:11:29 +0000 (04:11 +0000)]
change GAME_STEELSTORM2 to be after GAME_STEELSTORM again

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11624 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoswap order of GAME_STEELSTORM and GAME_STEELSTORM2 in detection list
havoc [Wed, 28 Dec 2011 02:46:39 +0000 (02:46 +0000)]
swap order of GAME_STEELSTORM and GAME_STEELSTORM2 in detection list

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11623 d7cf8633-e32d-0410-b094-e92efae38249

12 years agomake CSQC support the >0.05s/<0.0005s handling of standard player physics so CSQC...
divverent [Mon, 26 Dec 2011 15:54:33 +0000 (15:54 +0000)]
make CSQC support the >0.05s/<0.0005s handling of standard player physics so CSQC code doesn't have to

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

12 years agomake CSQC support the >0.05s/<0.0005s handling of standard player physics so CSQC...
divverent [Mon, 26 Dec 2011 15:54:33 +0000 (15:54 +0000)]
make CSQC support the >0.05s/<0.0005s handling of standard player physics so CSQC code doesn't have to

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11622 d7cf8633-e32d-0410-b094-e92efae38249

12 years agomod_obj_orientation cvar: 1 = DP's previous behaviour, 0 = leave coordinates alone...
divverent [Fri, 23 Dec 2011 22:39:32 +0000 (22:39 +0000)]
mod_obj_orientation cvar: 1 = DP's previous behaviour, 0 = leave coordinates alone (q3map2 compatible)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11621 d7cf8633-e32d-0410-b094-e92efae38249

12 years agomod_obj_orientation cvar: 1 = DP's previous behaviour, 0 = leave coordinates alone...
divverent [Fri, 23 Dec 2011 22:39:32 +0000 (22:39 +0000)]
mod_obj_orientation cvar: 1 = DP's previous behaviour, 0 = leave coordinates alone (q3map2 compatible)

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

12 years agoCumulative patch:
vortex [Wed, 21 Dec 2011 15:20:10 +0000 (15:20 +0000)]
Cumulative patch:
Fix RF_MODELLIGHT (was broken and dont work same way engine does it).
Fix bug in physics_ode_constantstep 1 (integer division, huh).
Added new geomtype field for ODE physics - sets collision shape, SOLID_PHYSICS_ are not deprecated (but keeped for compatibility reasons), as geomtype is a more correct way to set collision shape (allows to set both SOLID_CORPSE and trimesh collisions for instance).
Fixed support of custinfoparms.txt as some recent change in shader code seemed to broke it.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11620 d7cf8633-e32d-0410-b094-e92efae38249

12 years ago::stable-branch::reset=83a9479f76fc8cb37c8142b21b5942117b4c7394
Rudolf Polzer [Wed, 21 Dec 2011 15:09:21 +0000 (16:09 +0100)]
::stable-branch::reset=83a9479f76fc8cb37c8142b21b5942117b4c7394

12 years agooops, didn't want this debug spam to be committed
divverent [Tue, 20 Dec 2011 20:16:30 +0000 (20:16 +0000)]
oops, didn't want this debug spam to be committed

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11619 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoif(developer_extra.integer) Con_DPrintf("VM_CL_gettagindex(entity #%i): tag \"%s...
divverent [Tue, 20 Dec 2011 20:14:36 +0000 (20:14 +0000)]
if(developer_extra.integer) Con_DPrintf("VM_CL_gettagindex(entity #%i): tag \"%s\" not found\n", PRVM_NUM_FOR_EDICT(ent), tag_name);

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11618 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoif(developer_extra.integer) Con_DPrintf("VM_CL_gettagindex(entity #%i): tag \"%s...
divverent [Tue, 20 Dec 2011 20:14:36 +0000 (20:14 +0000)]
if(developer_extra.integer) Con_DPrintf("VM_CL_gettagindex(entity #%i): tag \"%s\" not found\n", PRVM_NUM_FOR_EDICT(ent), tag_name);

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

12 years agooops, didn't want this debug spam to be committed
divverent [Tue, 20 Dec 2011 20:16:30 +0000 (20:16 +0000)]
oops, didn't want this debug spam to be committed

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

12 years agoskip skip
divverent [Sun, 18 Dec 2011 15:29:05 +0000 (15:29 +0000)]
skip skip

This is referring to "surfaceparm skip".

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

12 years agoskip skip
divverent [Sun, 18 Dec 2011 15:29:05 +0000 (15:29 +0000)]
skip skip

This is referring to "surfaceparm skip".

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11617 d7cf8633-e32d-0410-b094-e92efae38249

12 years agor_water, MODE_REFRACTION: support alphaGen vertex for fading out water
divverent [Thu, 15 Dec 2011 21:04:33 +0000 (21:04 +0000)]
r_water, MODE_REFRACTION: support alphaGen vertex for fading out water

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

12 years agor_water, MODE_REFRACTION: support alphaGen vertex for fading out water
divverent [Thu, 15 Dec 2011 21:04:33 +0000 (21:04 +0000)]
r_water, MODE_REFRACTION: support alphaGen vertex for fading out water

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11616 d7cf8633-e32d-0410-b094-e92efae38249

12 years agosupport alphaGen vertex
divverent [Tue, 13 Dec 2011 20:44:37 +0000 (20:44 +0000)]
support alphaGen vertex

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

12 years agoget rid of 3 permutation bits
divverent [Tue, 13 Dec 2011 20:20:03 +0000 (20:20 +0000)]
get rid of 3 permutation bits

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

12 years agosupport alphaGen vertex
divverent [Tue, 13 Dec 2011 20:44:37 +0000 (20:44 +0000)]
support alphaGen vertex

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11615 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoget rid of 3 permutation bits
divverent [Tue, 13 Dec 2011 20:20:03 +0000 (20:20 +0000)]
get rid of 3 permutation bits

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11614 d7cf8633-e32d-0410-b094-e92efae38249

12 years agom_toggle takes a parameter, fix its definition
divverent [Mon, 12 Dec 2011 08:37:47 +0000 (08:37 +0000)]
m_toggle takes a parameter, fix its definition

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11613 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=3b602bcc324d22a9d2cf918a66f880d92a81ffe7

12 years agom_toggle takes a parameter, fix its definition
divverent [Mon, 12 Dec 2011 08:37:47 +0000 (08:37 +0000)]
m_toggle takes a parameter, fix its definition

Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11613 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoVM_sprintf: support color codes in %s
divverent [Mon, 12 Dec 2011 06:13:32 +0000 (06:13 +0000)]
VM_sprintf: support color codes in %s

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

12 years agoif no varfunc is left, NULL it
divverent [Sun, 11 Dec 2011 12:42:44 +0000 (12:42 +0000)]
if no varfunc is left, NULL it

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

12 years agoalias expansion, cvar expansion: support optional arguments
divverent [Sat, 10 Dec 2011 08:37:14 +0000 (08:37 +0000)]
alias expansion, cvar expansion: support optional arguments

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

12 years agoAdd THREADDISABLE define to make builds with whole threading system disabled.
vortex [Fri, 9 Dec 2011 23:10:16 +0000 (23:10 +0000)]
Add THREADDISABLE define to make builds with whole threading system disabled.

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

12 years agoVM_sprintf: support color codes in %s
divverent [Mon, 12 Dec 2011 06:13:32 +0000 (06:13 +0000)]
VM_sprintf: support color codes in %s

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11612 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoif no varfunc is left, NULL it
divverent [Sun, 11 Dec 2011 12:42:44 +0000 (12:42 +0000)]
if no varfunc is left, NULL it

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11611 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoalias expansion, cvar expansion: support optional arguments
divverent [Sat, 10 Dec 2011 08:37:14 +0000 (08:37 +0000)]
alias expansion, cvar expansion: support optional arguments

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11610 d7cf8633-e32d-0410-b094-e92efae38249

12 years agoAdd THREADDISABLE define to make builds with whole threading system disabled.
vortex [Fri, 9 Dec 2011 23:10:16 +0000 (23:10 +0000)]
Add THREADDISABLE define to make builds with whole threading system disabled.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11609 d7cf8633-e32d-0410-b094-e92efae38249

12 years agofix stupid typo
divverent [Fri, 9 Dec 2011 13:42:02 +0000 (13:42 +0000)]
fix stupid typo

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

12 years agofix stupid typo
divverent [Fri, 9 Dec 2011 13:42:02 +0000 (13:42 +0000)]
fix stupid typo

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11608 d7cf8633-e32d-0410-b094-e92efae38249

12 years agofor crypto keys, also write an easy to share text file with its fingerprint and status
divverent [Fri, 9 Dec 2011 12:53:21 +0000 (12:53 +0000)]
for crypto keys, also write an easy to share text file with its fingerprint and status

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

12 years agoWhile I'm reworking this anyway: also write a file key_0-public-fp.txt
divverent [Fri, 9 Dec 2011 12:53:18 +0000 (12:53 +0000)]
While I'm reworking this anyway: also write a file key_0-public-fp.txt

containing the public key fingerprint for a key when loading/keygenning. Helps
with submitting your key to websites.

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