Merge branch 'master' into terencehill/newpanelhud

Conflicts:
	qcsrc/common/constants.qh
	qcsrc/server/cl_client.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/View.qc
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/scoreboard.qc
Simple merge

diff --cc qcsrc/common/constants.qh
index 587cc2799a604b1d380a5bf4bb3fb354f763bad0,64dcaa44e1fb25f1fdb12c3c08767d1286632aad..3a60ae5c3e8bdfba4da5c6f8d708bb8b9ffbdada
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -113,7 -113,7 +113,8 @@@ const float ENT_CLIENT_HOOK = 27
  const float ENT_CLIENT_LGBEAM = 28;
  const float ENT_CLIENT_GAUNTLET = 29;
  const float ENT_CLIENT_ACCURACY = 30;
 +const float ENT_CLIENT_SHOWNAMES = 31;
+ const float ENT_CLIENT_WARPZONE_TELEPORTED = 31;
  
  const float ENT_CLIENT_TURRET = 40;
  

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
index 483f3bfbd59b6b071ce940a1e8c2813b28dc0f3f,b3d326264e0a2a702843ae0b874714d6eb11f0cf..d73772b72bf012339133614e9df4b55035081f07
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2711,13 -2715,9 +2728,6 @@@ void PlayerPreThink (void
                        return;                                 // the think tics
                }
  
-               if(self.teleport_time)
-               if(time > self.teleport_time)
-               {
-                       self.teleport_time = 0;
-                       self.effects = self.effects - (self.effects & EF_NODRAW);
-               }
 -              if(frametime > 0) // don't do this in cl_movement frames, just in server ticks
 -                      UpdateSelectedPlayer();
--
                //don't allow the player to turn around while game is paused!
                if(timeoutStatus == 2) {
                        self.v_angle = self.lastV_angle;

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/domination.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge