Merge branch 'master' into drlg/manhunt

diff --cc gamemodes-client.cfg
index 4a632e7d6d6da162e2a252cb3adc6564b0d197cb,71d272a174e7c50dcb868fa34e472d043668a250..00ba0adb1e7254de93bc5827df2c285dbc74711a
--- 1/gamemodes-client.cfg
--- 2/gamemodes-client.cfg
+++ b/gamemodes-client.cfg
@@@ -32,7 -32,6 +32,7 @@@ alias cl_hook_gamestart_k
  alias cl_hook_gamestart_ft
  alias cl_hook_gamestart_inv
  alias cl_hook_gamestart_duel
- alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
 +alias cl_hook_gamestart_mh
+ alias cl_hook_gameend
  alias cl_hook_shutdown
  alias cl_hook_activeweapon

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/common/ent_cs.qc
Simple merge

diff --cc qcsrc/common/notifications/all.inc
Simple merge

diff --cc qcsrc/common/stats.qh
index 7e260ec23aefe3ba5c855ae238935fbc74862a9c,128f090c4fd9ec94ff1269b3336bda705be60c8e..3e4e858a47e6ce4590224efb63e80f10f3709ef2
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -338,8 -342,8 +342,10 @@@ REGISTER_STAT(DOM_PPS_BLUE, float
  REGISTER_STAT(DOM_PPS_YELLOW, float)
  REGISTER_STAT(DOM_PPS_PINK, float)
  
 +// man hunt
 +REGISTER_STAT(MH_ROUNDTIMER, float)
+ // nexball
+ REGISTER_STAT(NB_METERSTART, float)
  
  #ifdef SVQC
  float autocvar_g_teleport_maxspeed;

diff --cc qcsrc/menu/xonotic/util.qc
index d3203fb65f5222372a6557e2d9d08ad77d1e5153,f98a8de8876e18ea5258fb5e0b6847234fc87de3..1d142879f8afbf49a7b02681dbfcf0c17a785ca3
--- 1/qcsrc/menu/xonotic/util.qc
--- 2/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@@ -681,9 -668,7 +668,8 @@@ float updateCompression(
        GAMETYPE(MAPINFO_TYPE_NEXBALL) \
        GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
        GAMETYPE(MAPINFO_TYPE_ASSAULT) \
 +      GAMETYPE(MAPINFO_TYPE_MANHUNT) \
        /* GAMETYPE(MAPINFO_TYPE_DUEL) */ \
-       /* GAMETYPE(MAPINFO_TYPE_INVASION) */ \
        /**/
  
  // hidden gametypes come last so indexing always works correctly

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

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