Merge remote-tracking branch 'origin/mirceakitsune/physical_entities'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 30 Jan 2013 13:03:25 +0000 (14:03 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 30 Jan 2013 13:03:25 +0000 (14:03 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -11,7 -9,7 +11,8 @@@ MUTATOR_DECLARATION(mutator_new_toys)
  MUTATOR_DECLARATION(mutator_nix);
  MUTATOR_DECLARATION(mutator_rocketflying);
  MUTATOR_DECLARATION(mutator_spawn_near_teammate);
+ MUTATOR_DECLARATION(mutator_physical_items);
  MUTATOR_DECLARATION(mutator_vampire);
 +MUTATOR_DECLARATION(mutator_superspec);
  
  MUTATOR_DECLARATION(sandbox);
@@@ -220,8 -216,8 +220,9 @@@ mutators/mutator_dodging.q
  mutators/mutator_rocketflying.qc
  mutators/mutator_vampire.qc
  mutators/mutator_spawn_near_teammate.qc
+ mutators/mutator_physical_items.qc
  mutators/sandbox.qc
 +mutators/mutator_superspec.qc
  
  ../warpzonelib/anglestransform.qc
  ../warpzonelib/mathlib.qc
Simple merge