From: z411 <z411@omaera.org>
Date: Mon, 17 Oct 2022 18:11:13 +0000 (-0300)
Subject: Merge branch 'master' into z411/ca-prevent-observer
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=618e3cf2875c3fda919d8eb5a74f925e7628b7ee;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/ca-prevent-observer
---

618e3cf2875c3fda919d8eb5a74f925e7628b7ee
diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index 383a281d5,d64ce3604..0d85af8cf
--- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
@@@ -1,6 -1,8 +1,7 @@@
  #include "sv_clanarena.qh"
  
  float autocvar_g_ca_damage2score = 100;
 -bool autocvar_g_ca_spectate_enemies;
+ bool autocvar_g_ca_prevent_stalemate;
  
  float autocvar_g_ca_start_health = 200;
  float autocvar_g_ca_start_armor = 200;