From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 30 Jan 2013 13:03:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/mirceakitsune/physical_entities'
X-Git-Tag: xonotic-v0.7.0~111
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a390ed02bde47c98a5e6bd47c7eb9b1cb3cd1dc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/mirceakitsune/physical_entities'
---

8a390ed02bde47c98a5e6bd47c7eb9b1cb3cd1dc
diff --cc qcsrc/server/mutators/mutators.qh
index 2ac6094d3,66aa94a33..7fcfd9883
--- a/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -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);
diff --cc qcsrc/server/progs.src
index 028519372,f2e011499..36936e386
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -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