Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sun, 1 May 2011 10:44:52 +0000 (13:44 +0300)
committerFruitieX <fruitiex@gmail.com>
Sun, 1 May 2011 10:44:52 +0000 (13:44 +0300)
Conflicts:
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc

13 files changed:
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/domination.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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_WARPZONE_TELEPORTED = 31;
 +const float ENT_CLIENT_SHOWNAMES = 31;
++const float ENT_CLIENT_WARPZONE_TELEPORTED = 32;
  
  const float ENT_CLIENT_TURRET = 40;
  
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge