Merge branch 'master' into Mario/team_keepaway

diff --cc gamemodes-client.cfg
index a24a321706ebf2174bceb19b228c878252fe8c04,71d272a174e7c50dcb868fa34e472d043668a250..ba39341df45da0ad216d24e497690ab3994c93f9
--- 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_tka
+ alias cl_hook_gameend
  alias cl_hook_shutdown
  alias cl_hook_activeweapon

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
index 691404ac117d183c95162716a60c886d405017cc,f98a8de8876e18ea5258fb5e0b6847234fc87de3..1a3b072074915281e595220e0473ea36a05a6103
--- 1/qcsrc/menu/xonotic/util.qc
--- 2/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) \

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