Merge branch 'master' into Mario/buffs

diff --cc _hud_descriptions.cfg
Simple merge

diff --cc hud_luminos.cfg
Simple merge

diff --cc hud_luminos_minimal.cfg
Simple merge

diff --cc hud_luminos_minimal_xhair.cfg
Simple merge

diff --cc hud_luminos_old.cfg
Simple merge

diff --cc hud_nexuiz.cfg
Simple merge

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

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

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

diff --cc qcsrc/common/constants.qh
Simple merge

diff --cc qcsrc/common/notifications.qh
Simple merge

diff --cc qcsrc/menu/classes.c
Simple merge

diff --cc qcsrc/menu/xonotic/mainwindow.c
Simple merge

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

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

diff --cc qcsrc/server/cl_physics.qc
index 4bfc2887067a3968c7498882b8f74a0512c18b15,43c7be517958e718b864f25bbf46e699b741c90d..7563cf5202214e39a6a272d47311397343a74108
--- 1/qcsrc/server/cl_physics.qc
--- 2/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@@ -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;
  

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

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

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

diff --cc qcsrc/server/mutators/base.qh
Simple merge