]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/race_cts_mutators
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:02:30 +0000 (01:02 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:02:30 +0000 (01:02 +1100)
1  2 
qcsrc/server/anticheat.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 9426d2d7413584b93dd8af4046d0878c3a257a15,812a1d390a000439b14d08f16032bb2d7a303b9d..07683fc16680bcad7385ec3a538f2590d47d7c05
@@@ -48,10 -50,9 +50,11 @@@ mutators/gamemode_keepaway.q
  mutators/gamemode_nexball.qh 
  mutators/gamemode_lms.qh
  mutators/gamemode_invasion.qh
 +mutators/gamemode_cts.qh
 +mutators/gamemode_race.qh
  mutators/mutator_dodging.qh
  mutators/mutator_nades.qh
+ mutators/mutator_buffs.qh
  
  //// tZork Turrets ////
  tturrets/include/turrets_early.qh
Simple merge