From: z411 <z411@omaera.org>
Date: Fri, 2 Dec 2022 03:14:06 +0000 (-0300)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80998959a66f519759ef42bf27da2060afa4c491;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/bai-server
---

80998959a66f519759ef42bf27da2060afa4c491
diff --cc .gitlab-ci.yml
index ddffef5ca,b6735a471..04449bff6
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -50,12 -64,12 +64,12 @@@ test_sv_game
      - diff notifications.cfg data/data/notifications_dump.cfg ||
          { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }
  
-     - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
-     - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
-     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
-     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
+     - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
+     - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
+     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
+     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
  
 -    - EXPECT=4c834aa9b5950ffe25deec1880f21641
 +    - EXPECT=2bdaa3c5ca1d929bfcfd42552e878fd4
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
        | tee /dev/stderr
        | sed -e 's,^\[[^]]*\] ,,'
diff --cc qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh
index e91c7780c,b3a8635a1..095d043b7
--- a/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/freezetag/freezetag.qh
index 347684b08,f1723757a..cde542f07
--- a/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)