Merge branch 'master' into Mario/buffs
authorMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:33:23 +0000 (17:33 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:33:23 +0000 (17:33 +1100)
20 files changed:
1  2 
_hud_descriptions.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh

Simple merge
diff --cc hud_luminos.cfg
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc hud_nexuiz.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -19,11 -19,12 +19,14 @@@ When you press the jump ke
  */
  void PlayerJump (void)
  {
+       if(self.player_blocked)
+               return; // no jumping while blocked
        float doublejump = FALSE;
 +      float mjumpheight = autocvar_sv_jumpvelocity;
  
        player_multijump = doublejump;
 +      player_jumpheight = mjumpheight;
        if(MUTATOR_CALLHOOK(PlayerJump))
                return;
  
Simple merge
Simple merge
Simple merge
Simple merge