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

diff --combined qcsrc/client/csqcmodel_hooks.qc
index 0f5c2700fbcffa0c3bba7786af64ffbf65c6e506,9fb02eddd8869e55583cce0c2ffc60508d478fa5..e464c8b9c58be6a29835cfe94d69c292f91749a5
--- 1/qcsrc/client/csqcmodel_hooks.qc
--- 2/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@@ -218,7 -218,7 +218,7 @@@ void CSQCPlayer_ForceModel_Apply(float 
                entity tm;
  
                for(tm = teams.sort_next; tm; tm = tm.sort_next)
 -                      if(tm.team != COLOR_SPECTATOR)
 +                      if(tm.team != FL_SPECTATOR)
                                ++teams_count;
  
                if(autocvar_cl_forcemyplayercolors)
@@@ -623,8 -623,8 +623,8 @@@ void CSQCModel_Hook_PreDraw(float ispla
                        }
                        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);