Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 6 Jan 2014 03:05:51 +0000 (14:05 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 6 Jan 2014 03:05:51 +0000 (14:05 +1100)
1  2 
defaultXonotic.cfg
gamemodes.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/teamplay.qc
qcsrc/server/vehicles/vehicles.qc

Simple merge
diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge