Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
	qcsrc/server/mutators/base.qh

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/items.qh
Simple merge

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

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

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

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

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

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

diff --cc qcsrc/server/mutators/base.qh
index a8828f8c6fec2f569457c21080389ac2782d0788,236e311b6a0cb8c0fa7fa39631678b8b46f6ab64..cd9c36fa0225aa023893fc85e8751715a1640ee1
--- 1/qcsrc/server/mutators/base.qh
--- 2/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@@ -206,30 -206,9 +206,37 @@@ MUTATOR_HOOKABLE(SetModname)
        // OUT
        string modname; // name of the mutator/mod if it warrants showing as such in the server browser
  
+ MUTATOR_HOOKABLE(SetWeaponreplace);
+       // IN
+               entity self; // map entity
+               entity other; // weapon info
+       // IN+OUT
+               string ret_string;
++
 +MUTATOR_HOOKABLE(PortalTeleport);
 +      // called whenever a player goes through a portal gun teleport
 +      // allows you to strip a player of an item if they go through the teleporter to help prevent cheating
 +      // INPUT
 +      entity self;
 +      
 +MUTATOR_HOOKABLE(HelpMePing);
 +      // called whenever a player uses impulse 33 (help me) in cl_impulse.qc
 +      // normally help me ping uses self.waypointsprite_attachedforcarrier,
 +      // but if your mutator uses something different then you can handle it
 +      // in a special manner using this hook
 +      // INPUT
 +      entity self; // the player who pressed impulse 33
 +      
 +MUTATOR_HOOKABLE(VehicleEnter);
 +      // called when a player enters a vehicle
 +      // allows mutators to set special settings in this event
 +      // INPUT
 +      entity other; // the player
 +      entity self; // the vehicle
 +      
 +MUTATOR_HOOKABLE(VehicleExit);
 +      // called when a player exits a vehicle
 +      // allows mutators to set special settings in this event
 +      // INPUT
 +      entity other; // the player
 +      entity self; // the vehicle

diff --cc qcsrc/server/mutators/gamemode_nexball.qc
Simple merge

diff --cc qcsrc/server/mutators/mutators.qh
index debdae989636107f8ec356897a34fa99f70a465e,4e7d9a6512bd47b8806d2f791fa5fc04cd9ab035..7c797848a08df3299214ae4c1d4ac59eb8e6e843
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -1,15 -1,14 +1,15 @@@
  MUTATOR_DECLARATION(gamemode_keyhunt);
  MUTATOR_DECLARATION(gamemode_freezetag);
  MUTATOR_DECLARATION(gamemode_keepaway);
 +MUTATOR_DECLARATION(gamemode_ctf);
  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_vampire);
  
  MUTATOR_DECLARATION(sandbox);

diff --cc qcsrc/server/progs.src
index c20090022f54d163e3a9c137d8c92483174e31f6,1890eddd97a679ae3f279e258dcfe0eb55c6c9f4..a0afb040c4e021711998e197a6f972c958fc2f84
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -206,12 -205,12 +206,13 @@@ playerstats.q
  ../common/explosion_equation.qc
  
  mutators/base.qc
 -mutators/gamemode_nexball.qc
 -mutators/gamemode_keyhunt.qc
 +mutators/gamemode_ctf.qc
  mutators/gamemode_freezetag.qc
 +mutators/gamemode_keyhunt.qc
  mutators/gamemode_keepaway.qc
 +mutators/gamemode_nexball.qc
  mutators/mutator_invincibleproj.qc
+ mutators/mutator_new_toys.qc
  mutators/mutator_nix.qc
  mutators/mutator_dodging.qc
  mutators/mutator_rocketflying.qc