]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'z411/ca-prevent-observer' into z411/bai-server
authorz411 <z411@omaera.org>
Sun, 30 Oct 2022 16:48:47 +0000 (13:48 -0300)
committerz411 <z411@omaera.org>
Sun, 30 Oct 2022 16:48:47 +0000 (13:48 -0300)
1  2 
gamemodes-server.cfg
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
qcsrc/server/client.qc
qcsrc/server/world.qh

Simple merge
Simple merge
Simple merge
Simple merge
index 1908c8d1ff5f320784b316f429219d12e5eab511,57b240d2abe0985a703ec0f8d12cf6d8c3b5219b..6ec6ccccc24191c385de96cbf59e1f90621743ac
@@@ -170,12 -162,7 +170,14 @@@ void readlevelcvars()
  .vector dropped_origin;
  void droptofloor(entity this);
  
 +/* z411 for RJZ */
 +bool autocvar_rjz_count_shards = false;
 +bool autocvar_rjz_ranks = false;
 +int  total_shards = 0;
 +void send_TotalShards(entity to);
 +void send_TotalShardsAll();
 +
  IntrusiveList g_moveables;
  STATIC_INIT(g_moveables) { g_moveables = IL_NEW(); }
+ bool observe_blocked_if_eliminated = false; // forbids eliminated players from observing