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

diff --cc gamemodes-server.cfg
Simple merge

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

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index 383a281d545c18fb761a6b0bf447b2b5abe56670,d64ce3604a293b4221d21ab5c1de21da31a32bac..0d85af8cf099b895b527acd3aaffcc3c0de5ad0c
--- 1/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
--- 2/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;

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

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

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