]> icculus.org git repositories - divverent/nexuiz.git/log
divverent/nexuiz.git
14 years agoRLE compress exosystem div0-stable
m0rfar [Sun, 28 Mar 2010 15:43:07 +0000 (15:43 +0000)]
RLE compress exosystem

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8757 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=07733232468b8502e07013ff1480644b8b480394

14 years agojust a small fix for one texture from eX set
morphed [Mon, 15 Mar 2010 01:24:01 +0000 (01:24 +0000)]
just a small fix for one texture from eX set

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8756 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=8ad1e32b883bd4339ea647051bb0088b617b2fbe

14 years agofix annoying sbar font size bug (showing wrong alignment in the title bar); also...
div0 [Sun, 14 Mar 2010 18:06:14 +0000 (18:06 +0000)]
fix annoying sbar font size bug (showing wrong alignment in the title bar); also make accuracy stats show the correct count of weapons
fix a line wrap bug in the accuracy HUD (Alt)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8755 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=d2239b32ade0b1a98053f5b1d499dce14bb64228

14 years agoprecache typehit.wav
m0rfar [Sun, 14 Mar 2010 15:00:13 +0000 (15:00 +0000)]
precache typehit.wav

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8754 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=47e573030b2e2a3f5228a979d95c83d4a066af49

14 years agoinfo_location description typo
m0rfar [Sun, 14 Mar 2010 14:24:10 +0000 (14:24 +0000)]
info_location description typo

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8753 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=6de13e172eec7c9eab72be60b37917f8e0225ccf

14 years agoAdding info that debugging on vista and 7 is not the same as in xp. I don't know...
m0rfar [Sun, 14 Mar 2010 13:24:00 +0000 (13:24 +0000)]
Adding info that debugging on vista and 7 is not the same as in xp. I don't know an easy way to debug on those.
Adding missing </div>.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8752 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=90c0ea468a0eb65a21a3a06cdfeebb3454763066

14 years agoadded g_respawn_waves cvar description
m0rfar [Sun, 14 Mar 2010 11:03:42 +0000 (11:03 +0000)]
added g_respawn_waves cvar description
respawn in waves (every n seconds), intended to decrease overwhelming base attacks

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8751 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=83db0ff8c1e7475daf7eef13739c792670e00c6c

14 years agoultra mini typo in a cvar description
m0rfar [Sun, 14 Mar 2010 10:53:38 +0000 (10:53 +0000)]
ultra mini typo in a cvar description

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8750 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=46ba214b48fb58fcec16657e1d0f5079368aa236

14 years agocvar typos
m0rfar [Sun, 14 Mar 2010 10:51:40 +0000 (10:51 +0000)]
cvar typos

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8749 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=d090ec87df6d95b0bab274fa18844cb353f1d1bd

14 years agoambient sound depends on master
m0rfar [Sun, 14 Mar 2010 10:50:52 +0000 (10:50 +0000)]
ambient sound depends on master

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8748 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=b8032768be1e6804f4dc1c582419f4f0c2157ddc

14 years agoDon't try to set a read-only cvar. (r_glsl is vid_gl20 now)
m0rfar [Sun, 14 Mar 2010 10:39:58 +0000 (10:39 +0000)]
Don't try to set a read-only cvar. (r_glsl is vid_gl20 now)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8747 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ae866848670669a601d98f3a0207eb45704cf85f

14 years agotry to fix map loading of hypergallery
div0 [Sat, 13 Mar 2010 16:31:03 +0000 (16:31 +0000)]
try to fix map loading of hypergallery

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8746 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=c9c80ce3621072dcd191a3463dffa49a24a12528

14 years agodefault to higher texture resolution
div0 [Wed, 10 Mar 2010 16:46:48 +0000 (16:46 +0000)]
default to higher texture resolution

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8745 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=dd6e7df3dc3b79e3f94129c7819e55acdf0a648b

14 years agoadd z velocity from trace_ent when jumping
fruitiex [Tue, 9 Mar 2010 21:27:47 +0000 (21:27 +0000)]
add z velocity from trace_ent when jumping

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8744 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=69a1e641389794799ffcefa947fc1e12ad1f7175

14 years agoless forward acceleration in physicsNoQWBunny please, it was too fast
div0 [Tue, 9 Mar 2010 14:43:36 +0000 (14:43 +0000)]
less forward acceleration in physicsNoQWBunny please, it was too fast

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8743 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ed8cd63a97e483bdb07cc8fa681e61aec6933e26

14 years agono QW bunny physics: adjust aircontrol, friction
div0 [Mon, 8 Mar 2010 13:01:47 +0000 (13:01 +0000)]
no QW bunny physics: adjust aircontrol, friction

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8742 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=3874aac82638b9f5d58beb1ae771634a8f6630a8

14 years agofix sideways friction negative
div0 [Sat, 6 Mar 2010 15:38:58 +0000 (15:38 +0000)]
fix sideways friction negative

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8741 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=69af5d3390e731809942ea4d7ac373e0041bb817

14 years agonerf crylink a lot (nexrun) :O
fruitiex [Sat, 6 Mar 2010 11:18:20 +0000 (11:18 +0000)]
nerf crylink a lot (nexrun) :O

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8740 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=48e554aebe6b24cb6ceb92d50e0b543d24b3c1c8

14 years ago"fix" the jumppads by adding a 2-frame delay for doublejumps after hitting a trigger_...
fruitiex [Fri, 5 Mar 2010 21:07:11 +0000 (21:07 +0000)]
"fix" the jumppads by adding a 2-frame delay for doublejumps after hitting a trigger_push, good as at least a temporary fix

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8739 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ad0b7ccf835a0cbe307d631ccec84d4511f8976d

14 years agohad forgotten to commit disabling of hagar secondary to nexrun, also fix precache...
fruitiex [Thu, 4 Mar 2010 10:51:37 +0000 (10:51 +0000)]
had forgotten to commit disabling of hagar secondary to nexrun, also fix precache issue with electro lightning gun mode

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8738 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=8cbd549804f739cc2641dbec1d9fa80abb4d4aa3

14 years agophysicsNoQWBunny: way more sideways friction, to apply in the CPMA air control range...
div0 [Wed, 3 Mar 2010 06:53:03 +0000 (06:53 +0000)]
physicsNoQWBunny: way more sideways friction, to apply in the CPMA air control range (slow turning keeps speed, fast turning loses speed); also makes fast turning more responsive

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8737 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=fd592fda4f7de5f7e8f6edf32691e217f4b07a08

14 years agofix a typo
div0 [Tue, 2 Mar 2010 09:14:51 +0000 (09:14 +0000)]
fix a typo

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8736 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=3ec102a1b83c56cb3d0869b67da39d26de86e85b

14 years agochange speed_up_zonly to an extra speed_z variable
div0 [Tue, 2 Mar 2010 08:28:32 +0000 (08:28 +0000)]
change speed_up_zonly to an extra speed_z variable

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8735 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=c49c48825029f3db855612274f7536050634fae3

14 years agoupdate the crylink in nexrun balance
fruitiex [Mon, 1 Mar 2010 20:17:32 +0000 (20:17 +0000)]
update the crylink in nexrun balance

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8734 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=34434e7cbb5dc15b4f5d0dee859fc551eacfdfde

14 years agoadded entity documentation for warpzones
div0 [Sun, 28 Feb 2010 19:58:52 +0000 (19:58 +0000)]
added entity documentation for warpzones

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8733 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=4ae53a90e484d0a3abae8116b6212bd1203d2069

14 years agofix cursor trace for chase cam
div0 [Sun, 28 Feb 2010 19:46:40 +0000 (19:46 +0000)]
fix cursor trace for chase cam

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8732 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ff40fda2afcf3b875a08c0c3b5008ce3f6360ae3

14 years agouse the correct crosshair trace where needed
div0 [Sun, 28 Feb 2010 19:46:36 +0000 (19:46 +0000)]
use the correct crosshair trace where needed

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8731 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ab90d1125a09a2a6488351310d53a3f963a7ae49

14 years agofix scale handling
div0 [Sun, 28 Feb 2010 19:46:31 +0000 (19:46 +0000)]
fix scale handling

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8730 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ca42b282e8bea12e5eb3c76ed0ad5120bf95268c

14 years agomake the cameras actually work
div0 [Sun, 28 Feb 2010 19:46:26 +0000 (19:46 +0000)]
make the cameras actually work

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8729 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=dc7f140717f8523541b1e493a5b3af9648773b11

14 years agocamera support: func_warpzone_camera -> target_position (this uses the shader common...
div0 [Sun, 28 Feb 2010 19:46:21 +0000 (19:46 +0000)]
camera support: func_warpzone_camera -> target_position (this uses the shader common/camera)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8728 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=71ac9a58f1990f1fec84dd28fbd2cf4ba75ea6d5

14 years agoprovide two alternatives to triger_warpzone--killtarget-->target_position:
div0 [Sun, 28 Feb 2010 19:46:15 +0000 (19:46 +0000)]
provide two alternatives to triger_warpzone--killtarget-->target_position:
1. trigger_warpzone_position--target-->trigger_warpzone
2. none, and using a a face with textures/common/warpzone shader instead: its normal is vectoangles'd into an orientation, and its center of weight is used as origin

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8727 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=9a18619ae7b62c995bc9b88d38e9571e3c9993bb

14 years agowarpzones: make warpzonelib depend less on Nexuiz
div0 [Sun, 28 Feb 2010 19:46:10 +0000 (19:46 +0000)]
warpzones: make warpzonelib depend less on Nexuiz

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8726 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=a460a1490e024117b3993e70c67ae4b6c7ea0631

14 years agooptional better warpzone culling: cl_warpzone_usetrace
div0 [Sun, 28 Feb 2010 19:46:06 +0000 (19:46 +0000)]
optional better warpzone culling: cl_warpzone_usetrace

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8725 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=6ee529575d1b7b8d11f12269194f74b8e219da90

14 years agobetter rick roll angle handling - cube map is now almost glitchfree :P
div0 [Sun, 28 Feb 2010 19:46:01 +0000 (19:46 +0000)]
better rick roll angle handling - cube map is now almost glitchfree :P

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8724 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=2431e4a64ceef6f74630784f58b7d3935c7a226d

14 years agofix some angles mess :P
div0 [Sun, 28 Feb 2010 19:45:54 +0000 (19:45 +0000)]
fix some angles mess :P

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8723 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=8eb24128edcc6ab4eaa0d6966408929988b80f91

14 years agofix abuse of v_ globals :P
div0 [Sun, 28 Feb 2010 19:45:50 +0000 (19:45 +0000)]
fix abuse of v_ globals :P

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8722 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=1a81a18c4ebdc737184e394cc9ea07778560b0c4

14 years agodisable the sidespeed/forwardspeed disabling workaround for now
div0 [Sun, 28 Feb 2010 19:45:45 +0000 (19:45 +0000)]
disable the sidespeed/forwardspeed disabling workaround for now

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8721 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=5066c398301e824a6dbfce92561fcb9d0498738b

14 years agolots of simplifaction of the trace function of warpzones
div0 [Sun, 28 Feb 2010 19:45:41 +0000 (19:45 +0000)]
lots of simplifaction of the trace function of warpzones

Conflicts:

data/qcsrc/server/w_crylink.qc

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8720 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=e1dd235ec66df36b3ab15adf5ff9669cf6d898c7

14 years agochange the sense of the transform in findradius
div0 [Sun, 28 Feb 2010 19:45:36 +0000 (19:45 +0000)]
change the sense of the transform in findradius

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8719 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=51d8d43312121e6b1607eb56c5cbacd24d090971

14 years agohide the glitch when warpzone changes angles by almost nullifying keyboard input
div0 [Sun, 28 Feb 2010 19:45:18 +0000 (19:45 +0000)]
hide the glitch when warpzone changes angles by almost nullifying keyboard input

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8718 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=62b0aa1e946bbeebaca3f7480db4e9955ccdeb6f

14 years agoignore refsys in findradius
div0 [Sun, 28 Feb 2010 19:45:04 +0000 (19:45 +0000)]
ignore refsys in findradius

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8717 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=8bae057bae1922be04cebfabb2293141b53a47fc

14 years agominor code cleanup; mark bug as todo
div0 [Sun, 28 Feb 2010 19:44:48 +0000 (19:44 +0000)]
minor code cleanup; mark bug as todo

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8716 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=024596a764d538ca0c779ff700417fcd4e5ba760

14 years agohandle traces correctly if starting inside a warpzone
div0 [Sun, 28 Feb 2010 19:44:41 +0000 (19:44 +0000)]
handle traces correctly if starting inside a warpzone

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8715 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=7ba9ca5e20da8eb2163800440fdabaf5bb2f5c56

14 years agouse r_drawexteriormodel to hide graphics glitch
div0 [Sun, 28 Feb 2010 19:44:36 +0000 (19:44 +0000)]
use r_drawexteriormodel to hide graphics glitch

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8714 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ea7361d6dd158a2d1c0c06e7cd0e8872a7b29b4c

14 years agofix nearclip threshold
div0 [Sun, 28 Feb 2010 19:44:29 +0000 (19:44 +0000)]
fix nearclip threshold

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8713 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=6b6586eb6cd65e3d6587c2012424971ff3895ec1

14 years agohook now working!
div0 [Sun, 28 Feb 2010 19:44:25 +0000 (19:44 +0000)]
hook now working!

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8712 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=c0d4523bdf8019c30ccbcf2609198061bf2acb6b

14 years agowe don't need preshift, all transforms can be represented as one angles and one shift
div0 [Sun, 28 Feb 2010 19:44:20 +0000 (19:44 +0000)]
we don't need preshift, all transforms can be represented as one angles and one shift

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8711 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=1405edb71ffcdc64d18eff4dbebf48044a7a8cfb

14 years agofix multi-zone impacts
div0 [Sun, 28 Feb 2010 19:44:16 +0000 (19:44 +0000)]
fix multi-zone impacts

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8710 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=af249c0a681eec410f343cd2a18c8d4d569ecf2a

14 years agofix RL
div0 [Sun, 28 Feb 2010 19:44:11 +0000 (19:44 +0000)]
fix RL

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8709 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=b8ba56ad8d1e2d812bab6cdaf54ed79c55eb4bb3

14 years agofix fireball
div0 [Sun, 28 Feb 2010 19:44:07 +0000 (19:44 +0000)]
fix fireball

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8708 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ffe681a668a8cb30fad5ef7740a766cd8a6becdf

14 years agofix electro combos through warpzones
div0 [Sun, 28 Feb 2010 19:44:01 +0000 (19:44 +0000)]
fix electro combos through warpzones

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8707 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=2e001c0d649a49b67d6ece1122e3af3b65c42206

14 years agofindradius wrapper - more guns work now
div0 [Sun, 28 Feb 2010 19:43:54 +0000 (19:43 +0000)]
findradius wrapper - more guns work now

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8706 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=576589dbcb1cf4cf951a5bc48a9ba2db315ca992

14 years agoTODO update
div0 [Sun, 28 Feb 2010 19:43:49 +0000 (19:43 +0000)]
TODO update

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8705 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=c3df1ccde7f926d4484482cd6208b1b8368b620e

14 years agoproperly transport projectiles
div0 [Sun, 28 Feb 2010 19:43:45 +0000 (19:43 +0000)]
properly transport projectiles

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8704 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ea04f662f6aeb325609c118f600d7f346a1bd4b3

14 years agoTODO file: add weapon support list
div0 [Sun, 28 Feb 2010 19:43:40 +0000 (19:43 +0000)]
TODO file: add weapon support list

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8703 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=9ce84e5ddcd3023e4ca23124664e3339cc540770

14 years agoremove a TODO item
div0 [Sun, 28 Feb 2010 19:43:36 +0000 (19:43 +0000)]
remove a TODO item

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8702 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=80a59a7e7a54f86ce0b72561cf0ff4afd028d028

14 years agonow bullets support warpzones too
div0 [Sun, 28 Feb 2010 19:43:31 +0000 (19:43 +0000)]
now bullets support warpzones too

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8701 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=df5540b380dd9fe90f168b30eee5983ff06e9650

14 years agowarpzone: fix nex shot origin
div0 [Sun, 28 Feb 2010 19:43:27 +0000 (19:43 +0000)]
warpzone: fix nex shot origin

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8700 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=9bf1d96b3f6ef5ab1a2dba1f4581a1dc2f38bbdb

14 years agonex also supports warpzones now
div0 [Sun, 28 Feb 2010 19:43:22 +0000 (19:43 +0000)]
nex also supports warpzones now

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8699 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=8ae02e7cf347e9ec4d211a4d9e76c15257a15266

14 years agoMinstaNex now can shoot through warpzones... using warpzone-aware tracebox and trailp...
div0 [Sun, 28 Feb 2010 19:43:17 +0000 (19:43 +0000)]
MinstaNex now can shoot through warpzones... using warpzone-aware tracebox and trailparticles functions

Conflicts:

data/qcsrc/server/w_crylink.qc

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8698 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=43056dd811051c7810fbe92002af00b314687c73

14 years agofix porto
div0 [Sun, 28 Feb 2010 19:43:12 +0000 (19:43 +0000)]
fix porto

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8697 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=45c0b73494f02bcc9f9a2f0edea14bb64a2b1f91

14 years agoturn the angles the other way for consistency
div0 [Sun, 28 Feb 2010 19:43:08 +0000 (19:43 +0000)]
turn the angles the other way for consistency

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8696 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=3f0b660efdec37862decaa040af844d58f9f6d19

14 years agotodo
div0 [Sun, 28 Feb 2010 19:43:03 +0000 (19:43 +0000)]
todo

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8695 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=6484f1df10cb36703a8be2ec27e8a2b13b54d976

14 years agoserver culling camera support
div0 [Sun, 28 Feb 2010 19:42:59 +0000 (19:42 +0000)]
server culling camera support

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8694 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=b1c18e8033adfaaffbdb0e525c8a8e5fda3b4c78

14 years agoTODO file
div0 [Sun, 28 Feb 2010 19:42:55 +0000 (19:42 +0000)]
TODO file

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8693 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=0c408a44218da2301b9dae2611113033a5499fc7

14 years agomore warpzone fixes - now angled warpzones work too
div0 [Sun, 28 Feb 2010 19:42:50 +0000 (19:42 +0000)]
more warpzone fixes - now angled warpzones work too

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8692 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=2f82c7e7896fe29d9f18cc720d8c9317255b3a9c

14 years agomissing file change
div0 [Sun, 28 Feb 2010 19:42:46 +0000 (19:42 +0000)]
missing file change

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8691 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=5dcd45b69bd1ce7a107e6740899e70ae815f8bd9

14 years agomove mathlib into warpzonelib too
div0 [Sun, 28 Feb 2010 19:42:41 +0000 (19:42 +0000)]
move mathlib into warpzonelib too

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8690 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=48abbfe562e7c964a217044b31f2c8fbc2a4d6b9

14 years agolicense typo fixed
div0 [Sun, 28 Feb 2010 19:42:36 +0000 (19:42 +0000)]
license typo fixed

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8689 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=501f4e35dab62db82dbeebe2d2602abd677de09e

14 years agomake warpzonelib depend less on Nexuiz
div0 [Sun, 28 Feb 2010 19:42:31 +0000 (19:42 +0000)]
make warpzonelib depend less on Nexuiz

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8688 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=7c8ad5d658b26149c7387d2e0ba34f60d37e07eb

14 years agowarpzonelib - the beginning
div0 [Sun, 28 Feb 2010 19:42:26 +0000 (19:42 +0000)]
warpzonelib - the beginning
NOTE: this patch breaks something on CLIENT side.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8687 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=7a95ee285fd745c9063a10adae25a3fe4b68db19

14 years agorequire only one of the two entities to target the other for warpzones, instead of...
div0 [Sun, 28 Feb 2010 19:42:21 +0000 (19:42 +0000)]
require only one of the two entities to target the other for warpzones, instead of a cyclic connection

Now, warpzone layout is:

trigger_warpzone --killtarget--> target_position for origin and direction
                 --target------> trigger_warpzone --kiltarget--> target_position for origin and direction

         ^
         |
+--------X--------+
|         _       |
+--------|\-------+
           \
            \
             \  ^
              \ |
        +------\X--------+
        |       \        |
        +----------------+

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8686 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=853a550602ea405e6c24ae4e4bdeee986d937584

14 years agofix in-solid players after warpzoning
div0 [Sun, 28 Feb 2010 19:42:17 +0000 (19:42 +0000)]
fix in-solid players after warpzoning

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8685 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=8e71280efed95fc6a75193840893e6bd9c122ce5

14 years agowarpzones: properly account for lag - predict them in CSQC
div0 [Sun, 28 Feb 2010 19:42:05 +0000 (19:42 +0000)]
warpzones: properly account for lag - predict them in CSQC

Conflicts:

data/qcsrc/client/View.qc

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8684 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=25d9072e72fbf9ad56c49b0e173d1e189fe2e17c

14 years agoVehicle Spiderbot:
tzork [Sun, 28 Feb 2010 19:33:07 +0000 (19:33 +0000)]
Vehicle Spiderbot:
Get rid of any cursor_*
Make aim accurate, even in chase mode.
Make rockets guided as long as you hold the secondary, when released rockets track the last spot aimed at before letting go. Do not refire rocket volleys as long as secondary is held.
Fix op part's animation (rocket reload).
Bit less messy turn/aim code.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8683 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=b5703a24292bc7bbae4462e78a6f7813e5fab2b4

14 years agoNew hud for spiderbot and racer
tzork [Sun, 28 Feb 2010 12:09:16 +0000 (12:09 +0000)]
New hud for spiderbot and racer

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8682 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=d3704e0cb41f3f7f8c6ca62ca52e40eef3cfa205

14 years agofix cursor trace start/endpos for chase cam
div0 [Sat, 27 Feb 2010 18:56:43 +0000 (18:56 +0000)]
fix cursor trace start/endpos for chase cam

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8681 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=ba14db28f15ec09c68b72e5e91a8aebb31c7eb01

14 years agohm... does cl_prydoncursor -1 really do what I want? Better not do that yet.
div0 [Sat, 27 Feb 2010 18:48:48 +0000 (18:48 +0000)]
hm... does cl_prydoncursor -1 really do what I want? Better not do that yet.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8680 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=a92958a8ead40a47c1de3560b73212555a8b6da9

14 years agoalso force cl_prydoncursor_notrace to 0 if antilag is 3
div0 [Sat, 27 Feb 2010 18:48:02 +0000 (18:48 +0000)]
also force cl_prydoncursor_notrace to 0 if antilag is 3

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8679 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=abce6873a9fdc4d34f21a00fcfa1d70fb8503539

14 years agoget rid of lots of prydon cursor trace use, only tZork's vehicles are left
div0 [Sat, 27 Feb 2010 18:26:56 +0000 (18:26 +0000)]
get rid of lots of prydon cursor trace use, only tZork's vehicles are left

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8678 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=f8e295131e9395c5832f480ddce7bdd6ce593a82

14 years agoGDB_ME env variable runs a test case in gdb now
div0 [Sat, 27 Feb 2010 17:38:13 +0000 (17:38 +0000)]
GDB_ME env variable runs a test case in gdb now

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8677 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=2f01c0048d0879f597568acb1b423ca2a0a6c092

14 years agoadd dprint, ftos, vtos to the functions a test case can always use
div0 [Sat, 27 Feb 2010 17:32:13 +0000 (17:32 +0000)]
add dprint, ftos, vtos to the functions a test case can always use

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8676 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=8d487eb0ea445f24d35810cbd77c88483f4febeb

14 years agotest case framework
div0 [Sat, 27 Feb 2010 17:32:04 +0000 (17:32 +0000)]
test case framework

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8675 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=f8b5b2e42d7b605a85da9e04c79362b5d013bff9

14 years agoVehicle racer:
tzork [Sat, 27 Feb 2010 02:14:28 +0000 (02:14 +0000)]
Vehicle racer:
 Ground-huger rockets.
 Autoaim Z correction for laser cannons (makes aiming possible in 3rd person view)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8674 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=7837701fb3c50ca38c61e4da1d7b1e8e160e266a

14 years agooops, had a little bug
merlijn [Thu, 25 Feb 2010 19:01:13 +0000 (19:01 +0000)]
oops, had a little bug

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8673 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=c9b90909b1a0e0dddf6ce4d5536f807b5e3101ae

14 years agorewrite the record plugin to actually make a little sense
merlijn [Thu, 25 Feb 2010 18:27:51 +0000 (18:27 +0000)]
rewrite the record plugin to actually make a little sense

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8672 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=80e69dc94eaf65ef83bb48f41a4f5a17a635e6f4

14 years agofix typo
fruitiex [Thu, 25 Feb 2010 00:44:18 +0000 (00:44 +0000)]
fix typo

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8671 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=d9bcc47dc83c749099aab06d2f192994bd8e94a0

14 years agoset rl detonatedelay to 9999, make electro an LG instead of HLAC
fruitiex [Thu, 25 Feb 2010 00:31:01 +0000 (00:31 +0000)]
set rl detonatedelay to 9999, make electro an LG instead of HLAC

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8670 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=c8ae097363327806cf13bd3b5be43d27b30cd6e4

14 years agofix warning
tzork [Wed, 24 Feb 2010 22:36:03 +0000 (22:36 +0000)]
fix warning

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8669 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=e41e4da5679d47466b064b2834bb5c893dd96d33

14 years agoadd a missing ;
esteel [Wed, 24 Feb 2010 22:30:13 +0000 (22:30 +0000)]
add a missing ;

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8668 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=d2cd4c4bddc3471fde37cf4ad866150d09cbfcab

14 years agomore work on the menu animation framework, now it has keyframe animations too.
esteel [Wed, 24 Feb 2010 22:07:55 +0000 (22:07 +0000)]
more work on the menu animation framework, now it has keyframe animations too.
removed the example comment-code from slider, guess its better to create a git branch as playground..

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8667 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=2c7df91953c0d667f66bb503b785dc395c748cbb

14 years agoTurret fusionreactor:
tzork [Wed, 24 Feb 2010 20:18:22 +0000 (20:18 +0000)]
Turret fusionreactor:
Fix top location
Add a small flash effect to target when it recharges a unit
Fix bbox
Top part variable spin speed depending on stored energy.
Tweak config

Turret tessa:
Tweak top animation, get rid of unnecessary field define.
Tweak config
Fix bbox

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8666 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=e58f927d3fc16b0d3882f940c64228a01ad8b49d

14 years agoFix one last bug for quakenet auth
merlijn [Wed, 24 Feb 2010 18:44:16 +0000 (18:44 +0000)]
Fix one last bug for quakenet auth

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8665 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=924a49bd3864ba5d0dee32c4ed527cc90cfe086e

14 years agonew cvar: allow grenade speed_up to only affect z-axis speed
fruitiex [Wed, 24 Feb 2010 15:59:02 +0000 (15:59 +0000)]
new cvar: allow grenade speed_up to only affect z-axis speed

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8664 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=6f7b0d85933e11ac8cb86ad36b8ae0169e9764a5

14 years agooops, forgot the crylink code
fruitiex [Wed, 24 Feb 2010 14:44:44 +0000 (14:44 +0000)]
oops, forgot the crylink code

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8663 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=b2d1d67e25e8dd79de38854ec8f72a4b08fbd79d

14 years agoresurrect the nexrun dm stuff with a *few* changes :)
fruitiex [Wed, 24 Feb 2010 14:37:37 +0000 (14:37 +0000)]
resurrect the nexrun dm stuff with a *few* changes :)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8662 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=a70cb1f57ac852822690ef40f42f53a7096c4d82

14 years agocorrect a typo in accident's mapinfo file
fruitiex [Wed, 24 Feb 2010 09:29:55 +0000 (09:29 +0000)]
correct a typo in accident's mapinfo file

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8661 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=2dd5a3a94fcdd864cb5c81fd7a3d73b0448fdc6c

14 years agomore anim math functions, some restructuring.. need to make the animated sliders...
esteel [Mon, 22 Feb 2010 19:44:12 +0000 (19:44 +0000)]
more anim math functions, some restructuring.. need to make the animated sliders go to near the point you clicked and work with dragging then it might be useful :P

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8660 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::merge=de09827846bf6433a897fec3a130ff3e6c08a9cb

14 years agoUNMERGE
div0 div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa [Sun, 27 Sep 2009 10:59:48 +0000 (10:59 +0000)]
UNMERGE
commenting out the switchover prevention again, so I can choose to NOT merge this part of the changes

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7946 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
::stable-branch::unmerge=bbeb1dc26154d98a532e2e20001052ac7831920e

14 years ago::stable-branch::reset=fe0abb0a348fc3393377ca8f5e77df6d4043c155
Rudolf Polzer [Mon, 22 Feb 2010 18:48:42 +0000 (19:48 +0100)]
::stable-branch::reset=fe0abb0a348fc3393377ca8f5e77df6d4043c155