Merge branch 'master' into Lyberta/RandomItems

diff --combined qcsrc/common/stats.qh
index 71149463c59499e90bc87f8c44c57cfbc2a9c73d,4fff7de736938402fe7c72b0a468106beef6cd43..77f01e267203423caf07c25abfe47d2f9a8b9a14
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -295,7 -295,6 +295,7 @@@ REGISTER_STAT(SLICK_APPLYGRAVITY, bool
  
  #ifdef SVQC
  #include "physics/movetypes/movetypes.qh"
 +float warmup_limit;
  #endif
  
  REGISTER_STAT(MOVEVARS_AIRACCEL_QW_STRETCHFACTOR, float)
@@@ -339,6 -338,7 +339,7 @@@ REGISTER_STAT(MOVEVARS_AIRACCELERATE, f
  // FIXME: Was 0 on server, 1 on client. Still want that?
  REGISTER_STAT(MOVEVARS_ENTGRAVITY, float, (this.gravity) ? this.gravity : 1)
  REGISTER_STAT(MOVEVARS_JUMPVELOCITY, float)
+ REGISTER_STAT(MOVEVARS_JUMPVELOCITY_CROUCH, float)
  REGISTER_STAT(MOVEVARS_MAXAIRSPEED, float)
  REGISTER_STAT(MOVEVARS_STEPHEIGHT, float, autocvar_sv_stepheight)
  REGISTER_STAT(MOVEVARS_AIRACCEL_QW, float)

diff --combined qcsrc/server/defs.qh
index 08a4a726bd54ab0b47362c79d69fe178dd302f8f,89582bb7a009f81e4e183604ebdd103894c610b8..0566d576767bdaf8e3d6f1012e7090c0e69d2aa2
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -1,5 -1,6 +1,5 @@@
  #pragma once
  
 -float warmup_limit;
  #include <common/weapons/_all.qh>
  #include <common/stats.qh>
  
@@@ -375,6 -376,8 +375,8 @@@ const float ACTIVE_TOGGLE  = 3
  
  .float stat_respawn_time = _STAT(RESPAWN_TIME); // shows respawn time, and is negative when awaiting respawn
  
+ .int killindicator_teamchange;
+ 
  void PlayerUseKey(entity this);
  
  USING(spawn_evalfunc_t, vector(entity this, entity player, entity spot, vector current));