Merge branch 'master' into z411/bai-server

diff --cc qcsrc/common/constants.qh
index 43236b2b8517c1263bdb3700610110c7fad1d84a,feaa9f8651ea47e3251ae867f5c88a335718edc0..de93c94c33dc3dd48c2893cbc8e54b734bcad2f4
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -7,15 -7,15 +7,16 @@@ const int FRAGS_PLAYER_OUT_OF_GAME = -6
  ///////////////////////////
  // cvar constants
  
- const int CVAR_SAVE = 1;
- const int CVAR_NOTIFY = 2;
- const int CVAR_READONLY = 4;
+ const int CVAR_SAVE = BIT(0);
+ const int CVAR_NOTIFY = BIT(1);
+ const int CVAR_READONLY = BIT(2);
  
  // server flags
- const int SERVERFLAG_ALLOW_FULLBRIGHT = 1;
- const int SERVERFLAG_TEAMPLAY = 2;
- const int SERVERFLAG_PLAYERSTATS = 4;
- const int SERVERFLAG_FORBID_PICKUPTIMER = 8;
+ const int SERVERFLAG_ALLOW_FULLBRIGHT = BIT(0);
+ const int SERVERFLAG_TEAMPLAY = BIT(1);
+ const int SERVERFLAG_PLAYERSTATS = BIT(2);
+ const int SERVERFLAG_PLAYERSTATS_CUSTOM = BIT(3);
++const int SERVERFLAG_FORBID_PICKUPTIMER = BIT(4);
  
  const int SPECIES_HUMAN = 0;
  const int SPECIES_ROBOT_SOLID = 1;

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

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

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
Simple merge

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

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

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

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