Merge branch 'master' into mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/server/autocvars.qh
index ed5e3fbaa9051dd34459c16b40f767adf6ddf370,c8db3db8a409c5749a6b1c4fef7e086cdb5d22dd..4b64ae3512cd010e8a83921be56248a9b829220c
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1275,47 -1275,6 +1275,50 @@@ float autocvar_g_sandbox_object_materia
  float autocvar_g_sandbox_object_material_velocity_factor;
  float autocvar_g_max_info_autoscreenshot;
  float autocvar_physics_ode;
+ float autocvar_g_physical_items;
+ float autocvar_g_physical_items_damageforcescale;
+ float autocvar_g_physical_items_reset;
 +float autocvar_g_td_start_wave;
 +float autocvar_g_td_generator_health;
 +float autocvar_g_td_current_monsters;
 +float autocvar_g_td_generator_damaged_points;
 +float autocvar_g_td_monster_count;
 +float autocvar_g_td_monster_count_increment;
 +float autocvar_g_td_buildphase_time;
 +float autocvar_g_td_pvp;
 +float autocvar_g_td_max_waves;
 +float autocvar_g_td_kill_points;
 +float autocvar_g_td_turretkill_points;
 +float autocvar_g_td_generator_dontend;
 +float autocvar_g_td_force_settings;
 +float autocvar_g_td_turret_max;
 +float autocvar_g_td_turret_plasma_cost;
 +float autocvar_g_td_turret_mlrs_cost;
 +float autocvar_g_td_turret_walker_cost;
 +float autocvar_g_td_tower_buff_cost;
 +float autocvar_g_td_monsters_skill_start;
 +float autocvar_g_td_monsters_skill_increment;
 +float autocvar_g_td_monsters_spawnshield_time;
 +float autocvar_g_td_turret_upgrade_cost;
 +float autocvar_g_za_monster_count;
 +float autocvar_g_monsters;
 +float autocvar_g_monsters_max;
 +float autocvar_g_monsters_max_perplayer;
 +float autocvar_g_monsters_giants_only;
 +float autocvar_g_monsters_typefrag;
 +float autocvar_g_monsters_owners;
 +float autocvar_g_monsters_miniboss_chance;
 +float autocvar_g_monsters_miniboss_healthboost;
 +float autocvar_g_monsters_forcedrop;
 +string autocvar_g_monsters_drop_type;
 +string autocvar_g_monsters_drop_size;
 +float autocvar_g_monsters_teams;
 +float autocvar_g_monsters_healthbars;
 +float autocvar_g_monsters_respawn_delay;
 +float autocvar_g_monsters_respawn;
 +float autocvar_g_monsters_nogiants;
 +float autocvar_g_monsters_skill_easy;
 +float autocvar_g_monsters_skill_normal;
 +float autocvar_g_monsters_skill_hard;
 +float autocvar_g_monsters_skill_insane;
 +float autocvar_g_monsters_skill_nightmare;

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

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

diff --cc qcsrc/server/command/sv_cmd.qc
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 b1cd9469e079cd69fea24400c334657fc40b065a,7fcfd9883bb9195f24b7f513ffc1e8189d03c014..bfd06002ea3b1a4525f2acfd6fa6d71fb913f116
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -12,8 -11,8 +12,9 @@@ 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(mutator_zombie_apocalypse);
  
  MUTATOR_DECLARATION(sandbox);

diff --cc qcsrc/server/progs.src
index 7b30b2ebae1570d51054359d0c37d062fc7f8027,36936e38642e597bad39ca5b3d56621450a9dbe1..6139d33714a5dc7edadc5b6bf25201418b0530fb
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -224,9 -220,9 +224,10 @@@ 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
 +mutators/mutator_zombie_apocalypse.qc
  
  ../warpzonelib/anglestransform.qc
  ../warpzonelib/mathlib.qc