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

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/server/mutators/base.qh
Simple merge

diff --cc qcsrc/server/mutators/mutators.qh
index 2ac6094d339d578d174da5ec3ed06eed91fcad20,66aa94a33faa5a8f4f907bef58da070817910a25..7fcfd9883bb9195f24b7f513ffc1e8189d03c014
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/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 028519372f025ae24aa923d472ba0a6593de86b7,f2e0114990b5a790cef02c7262bd1169022b0db6..36936e38642e597bad39ca5b3d56621450a9dbe1
--- 1/qcsrc/server/progs.src
--- 2/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

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