From: LegendaryGuard <rootuser999@gmail.com>
Date: Mon, 11 Jul 2022 17:51:11 +0000 (+0200)
Subject: Merge branch 'master' into drlg/manhunt
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89b2509a03512cda6cfe0fdf061be26fe1873c33;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into drlg/manhunt
---

89b2509a03512cda6cfe0fdf061be26fe1873c33
diff --cc gamemodes-client.cfg
index 4a632e7d6,71d272a17..00ba0adb1
--- a/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_gamestart_mh
- alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
+ alias cl_hook_gameend
  alias cl_hook_shutdown
  alias cl_hook_activeweapon
diff --cc qcsrc/common/stats.qh
index 7e260ec23,128f090c4..3e4e858a4
--- a/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 d3203fb65,f98a8de88..1d142879f
--- a/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