Merge branch 'master' into Mario/nade_drop

diff --cc qcsrc/server/mutators/mutator_nades.qc
index 025c481990819913c89d7a80215d6254097aac1a,5ab6df75dc720e2d6b385ed665d1cf0ccf9fcfc3..2fad6022673c855e4fae529dfe8dc6158bba0954
--- 1/qcsrc/server/mutators/mutator_nades.qc
--- 2/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)