From: Mario Date: Thu, 30 Jun 2022 13:26:14 +0000 (+1000) Subject: Merge branch 'master' into Mario/team_keepaway X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2d03f0e82d6abd0d19c68b8b4d239f24d5417651;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/team_keepaway --- 2d03f0e82d6abd0d19c68b8b4d239f24d5417651 diff --cc gamemodes-client.cfg index a24a321706,71d272a174..ba39341df4 --- 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_tka - 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/menu/xonotic/util.qc index 691404ac11,f98a8de887..1a3b072074 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@@ -680,6 -662,6 +662,7 @@@ float updateCompression( GAMETYPE(MAPINFO_TYPE_CA) \ GAMETYPE(MAPINFO_TYPE_FREEZETAG) \ GAMETYPE(MAPINFO_TYPE_KEEPAWAY) \ ++ GAMETYPE(MAPINFO_TYPE_TEAMKEEPAWAY) \ GAMETYPE(MAPINFO_TYPE_KEYHUNT) \ GAMETYPE(MAPINFO_TYPE_LMS) \ GAMETYPE(MAPINFO_TYPE_DOMINATION) \