Merge branch 'master' into Mario/survival

diff --cc gamemodes-server.cfg
Simple merge

diff --cc notifications.cfg
Simple merge

diff --cc qcsrc/common/ent_cs.qc
index e903bd5bbfca1275e0fa78147ec2d9566c39260a,a3691386be379296ae2b494025666e320a13de18..7bc6aa52587370c606101d80ea3ae9ef0e4636ef
--- 1/qcsrc/common/ent_cs.qc
--- 2/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@@ -157,19 -157,25 +157,30 @@@ ENTCS_PROP(SOLID, true, sv_solid, solid
        { WriteByte(chan, ent.sv_solid); },
        { ent.sv_solid = ReadByte(); })
  
 +// gamemode specific player survival status (independent of score and frags)
 +ENTCS_PROP(SURVIVAL_STATUS, true, survival_status, survival_status, ENTCS_SET_NORMAL,
 +      { WriteShort(chan, ent.survival_status); },
 +      { ent.survival_status = ReadShort(); })
 +
  #ifdef SVQC
  
-       int ENTCS_PUBLICMASK = 0;
+       int ENTCS_PUBLICMASK = 0, ENTCS_PRIVATEMASK = 0;
        STATIC_INIT(ENTCS_PUBLICMASK)
        {
-               FOREACH(EntCSProps, it.m_public,
+               FOREACH(EntCSProps, true,
                {
-                       ENTCS_PUBLICMASK |= BIT(it.m_id);
+                       if (it.m_public)
+                               ENTCS_PUBLICMASK |= BIT(it.m_id);
+                       else
+                               ENTCS_PRIVATEMASK |= BIT(it.m_id);
+               });
+       }
+ 
+       void entcs_update_players(entity player)
+       {
+               FOREACH_CLIENT(it != player && IS_PLAYER(it),
+               {
+                       CS(it).entcs.SendFlags |= ENTCS_PRIVATEMASK;
                });
        }
  

diff --cc qcsrc/common/notifications/all.inc
Simple merge

diff --cc qcsrc/common/notifications/all.qh
Simple merge

diff --cc qcsrc/common/scores.qh
Simple merge

diff --cc qcsrc/common/stats.qh
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge