Merge branch 'master' into z411/bai-server

diff --cc .gitlab-ci.yml
index ddffef5ca470b89486bbc428b4aae475a9ddc570,b6735a471d6ea8e3d1dd03101d1620ae6d697366..04449bff64d49fd452c9031eccfbbf929cce3332
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -50,12 -64,12 +64,12 @@@ test_sv_game
      - diff notifications.cfg data/data/notifications_dump.cfg ||\r
          { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
  \r
-     - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
-     - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
-     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
-     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
+     - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
+     - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
+     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
+     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
  \r
 -    - EXPECT=4c834aa9b5950ffe25deec1880f21641\r
 +    - EXPECT=2bdaa3c5ca1d929bfcfd42552e878fd4\r
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | sed -e 's,^\[[^]]*\] ,,'\r

diff --cc gamemodes-server.cfg
Simple merge

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

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

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

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

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

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh
index e91c7780ca63f5fbc3943ac4c9a277be9aa91a1d,b3a8635a14a396f3e55d5093a1809c627cc7e529..095d043b7128b69363a1b9ead5a18ac02b868bca
--- 1/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh
--- 2/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh
@@@ -38,12 -37,11 +38,12 @@@ CLASS(ClanArena, Gametype
      METHOD(ClanArena, m_configuremenu, void(Gametype this, entity menu, void(entity me, string pLabel, float pMin, float pMax, float pStep, string pCvar, string tCvar, string pTooltip) returns))
      {
          TC(Gametype, this);
-         returns(menu, _("Frag limit:"),      5,  100,  5, "fraglimit_override",        "g_ca_teams_override",          _("The amount of frags needed before the match will end"));
+         returns(menu, _("Round limit:"),     5,  100,  5, "fraglimit_override",        "g_ca_teams_override",          _("The amount of rounds won needed before the match will end"));
      }
  #ifdef CSQC
 -    ATTRIB(ClanArena, m_modicons, void(vector pos, vector mySize), HUD_Mod_CA);
 -    ATTRIB(ClanArena, m_modicons_export, void(int fh), HUD_Mod_CA_Export);
 +    //ATTRIB(ClanArena, m_modicons, void(vector pos, vector mySize), HUD_Mod_CA);
 +    //ATTRIB(ClanArena, m_modicons_export, void(int fh), HUD_Mod_CA_Export);
 +    ATTRIB(ClanArena, m_modscores, int(int team), HUD_Scores_CA);
  #endif
      ATTRIB(ClanArena, m_legacydefaults, string, "10 20 0");
  ENDCLASS(ClanArena)

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
index 347684b08143625ed8646808f2e58744f28dba80,f1723757a6024d1d0a92ed5dfbd16f26995dcd60..cde542f0772f6626e9b5fdb78f286bee3bde01f4
--- 1/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
--- 2/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
@@@ -40,12 -40,11 +40,12 @@@ CLASS(FreezeTag, Gametype
      METHOD(FreezeTag, m_configuremenu, void(Gametype this, entity menu, void(entity me, string pLabel, float pMin, float pMax, float pStep, string pCvar, string tCvar, string pTooltip) returns))
      {
          TC(Gametype, this);
-         returns(menu, _("Frag limit:"),      5,  100,  5, "fraglimit_override",        "g_freezetag_teams_override",   _("The amount of frags needed before the match will end"));
+         returns(menu, _("Round limit:"),     5,  100,  5, "fraglimit_override",        "g_freezetag_teams_override",   _("The amount of rounds won needed before the match will end"));
      }
  #ifdef CSQC
 -    ATTRIB(FreezeTag, m_modicons, void(vector pos, vector mySize), HUD_Mod_FreezeTag);
 -    ATTRIB(FreezeTag, m_modicons_export, void(int fh), HUD_Mod_FreezeTag_Export);
 +    //ATTRIB(FreezeTag, m_modicons, void(vector pos, vector mySize), HUD_Mod_FreezeTag);
 +    //ATTRIB(FreezeTag, m_modicons_export, void(int fh), HUD_Mod_FreezeTag_Export);
 +    ATTRIB(FreezeTag, m_modscores, int(int team), HUD_Scores_CA);
  #endif
      ATTRIB(FreezeTag, m_legacydefaults, string, "10 20 0");
  ENDCLASS(FreezeTag)

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/oknex.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vortex.qc
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge

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

diff --cc xonotic-server.cfg
Simple merge