From: Mario Date: Sun, 24 Nov 2013 04:13:06 +0000 (+1100) Subject: Merge branch 'master' into Mario/nade_drop X-Git-Tag: xonotic-v0.8.0~226^2~3^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9531e6a07b13cbccf27113f1dcb6e5ccacc6fbb4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/nade_drop --- 9531e6a07b13cbccf27113f1dcb6e5ccacc6fbb4 diff --cc qcsrc/server/mutators/mutator_nades.qc index 025c48199,5ab6df75d..2fad60226 --- a/qcsrc/server/mutators/mutator_nades.qc +++ b/qcsrc/server/mutators/mutator_nades.qc @@@ -168,9 -168,9 +168,9 @@@ void toss_nade(entity e, vector _veloci tracebox(_nade.origin, _nade.mins, _nade.maxs, _nade.origin, FALSE, _nade); if (trace_startsolid) setorigin(_nade, e.origin); - + - if(e.crouch) - _nade.velocity = '0 0 -10'; + if(self.v_angle_x >= 70 && self.v_angle_x <= 110) + _nade.velocity = '0 0 100'; else if(autocvar_g_nades_nade_newton_style == 1) _nade.velocity = e.velocity + _velocity; else if(autocvar_g_nades_nade_newton_style == 2)