Merge branch 'master' into Mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

diff --cc gamemodes.cfg
Simple merge

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

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

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

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

diff --cc qcsrc/server/mutators/gamemode_ca.qc
index 74a7fd38a374b1f14be728887a76fbc346d03289,9df6b42a219645e9f0d09a959dba94211bdb2108..8a6315c4236bd1673758253449af1889fe2e35e8
--- 1/qcsrc/server/mutators/gamemode_ca.qc
--- 2/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@@ -272,25 -268,6 +268,12 @@@ MUTATOR_HOOKFUNCTION(ca_PlayerDamage_Sp
        return FALSE;
  }
  
- // scoreboard setup
- void ca_ScoreRules()
- {
-       ScoreRules_basics(2, SFL_SORT_PRIO_PRIMARY, 0, TRUE);
-       ScoreInfo_SetLabel_TeamScore  (ST_CA_ROUNDS,    "rounds",    SFL_SORT_PRIO_PRIMARY);
-       ScoreRules_basics_end();
- }
- 
- void ca_DelayedInit() // Do this check with a delay so we can wait for teams to be set up.
- {
-       ca_ScoreRules();
- }
- 
 +MUTATOR_HOOKFUNCTION(ca_PlayerRegen)
 +{
 +      // no regeneration in CA
 +      return TRUE;
 +}
 +
  void ca_Initialize()
  {
        allowed_to_spawn = TRUE;

diff --cc qcsrc/server/mutators/gamemode_lms.qc
Simple merge

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

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