Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 0f5c2700fbcffa0c3bba7786af64ffbf65c6e506..e464c8b9c58be6a29835cfe94d69c292f91749a5 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -623,8 +623,8 @@ void CSQCModel_Hook_PreDraw(float isplayer)
                        }
                        else
                        {
-                               tracebox(self.origin + '0 0 1', self.mins, self.maxs, self.origin - '0 0 1', MOVE_NORMAL, self);
-                               if(trace_fraction < 1 && trace_plane_normal_z > 0.7)
+                               tracebox(self.origin + '0 0 1', self.mins, self.maxs, self.origin - '0 0 4', MOVE_NORMAL, self);
+                               if(trace_startsolid || trace_fraction < 1)
                                        onground = 1;
                        }
                        animdecide_init(self);