Merge branch 'master' into mirceakitsune/physical_entities

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/server/miscfunctions.qc
index 88b29fe27123dd2138058b573137baffbea0dab7,3826b683af6c16ceb8ca7d33aa108ed06269e8e7..95f2cb533b49c758d2fe378ee79ddd5745ee862d
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -1065,21 -1102,26 +1102,28 @@@ float sv_pitch_fixyaw
  string GetGametype(); // g_world.qc
  void readlevelcvars(void)
  {
-       // first load all the mutators
-       if(cvar("g_invincible_projectiles"))
-               MUTATOR_ADD(mutator_invincibleprojectiles);
-       if(cvar("g_nix"))
-               MUTATOR_ADD(mutator_nix);
+       g_minstagib = cvar("g_minstagib");
+ 
+       // load ALL the mutators
        if(cvar("g_dodging"))
                MUTATOR_ADD(mutator_dodging);
-       if(cvar("g_rocket_flying"))
-               MUTATOR_ADD(mutator_rocketflying);
-       if(cvar("g_vampire"))
-               MUTATOR_ADD(mutator_vampire);
        if(cvar("g_spawn_near_teammate"))
                MUTATOR_ADD(mutator_spawn_near_teammate);
 +      if(cvar("g_physical_items"))
 +              MUTATOR_ADD(mutator_physical_items);
+       if(!g_minstagib)
+       {
+               if(cvar("g_invincible_projectiles"))
+                       MUTATOR_ADD(mutator_invincibleprojectiles);
+               if(cvar("g_new_toys"))
+                       MUTATOR_ADD(mutator_new_toys);
+               if(cvar("g_nix"))
+                       MUTATOR_ADD(mutator_nix);
+               if(cvar("g_rocket_flying"))
+                       MUTATOR_ADD(mutator_rocketflying);
+               if(cvar("g_vampire"))
+                       MUTATOR_ADD(mutator_vampire);
+       }
  
        // is this a mutator? is this a mode?
        if(cvar("g_sandbox"))

diff --cc qcsrc/server/mutators/base.qh
index ff5de6cfa4086ccca2460827d7c34427f8b93d2a,236e311b6a0cb8c0fa7fa39631678b8b46f6ab64..57777e4b9a9379d79a9d6deaef692caaf69e55df
--- 1/qcsrc/server/mutators/base.qh
--- 2/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@@ -205,9 -205,10 +205,16 @@@ MUTATOR_HOOKABLE(SV_StartFrame)
  MUTATOR_HOOKABLE(SetModname);
        // OUT
        string modname; // name of the mutator/mod if it warrants showing as such in the server browser
 +      
 +MUTATOR_HOOKABLE(Item_Spawn);
 +      // called for each item being spawned on a map, including dropped weapons
 +      // return 1 to remove an item
 +      // INPUT
 +      entity self; // the item
+ 
+ MUTATOR_HOOKABLE(SetWeaponreplace);
+       // IN
+               entity self; // map entity
+               entity other; // weapon info
+       // IN+OUT
+               string ret_string;

diff --cc qcsrc/server/mutators/mutators.qh
index 4d019eec00379f9ed4c92cc05d8f3bba9793008c,4e7d9a6512bd47b8806d2f791fa5fc04cd9ab035..66aa94a33faa5a8f4f907bef58da070817910a25
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -3,13 -3,12 +3,13 @@@ MUTATOR_DECLARATION(gamemode_freezetag)
  MUTATOR_DECLARATION(gamemode_keepaway);
  MUTATOR_DECLARATION(gamemode_nexball);
  
+ MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_invincibleprojectiles);
+ MUTATOR_DECLARATION(mutator_new_toys);
  MUTATOR_DECLARATION(mutator_nix);
- MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_rocketflying);
- MUTATOR_DECLARATION(mutator_vampire);
- MUTATOR_DECLARATION(mutator_spawn_near_teammate);
  MUTATOR_DECLARATION(mutator_spawn_near_teammate);
 +MUTATOR_DECLARATION(mutator_physical_items);
+ MUTATOR_DECLARATION(mutator_vampire);
  
  MUTATOR_DECLARATION(sandbox);

diff --cc qcsrc/server/progs.src
Simple merge

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