Merge branch 'master' into Mario/turrets

# Conflicts:
#	qcsrc/client/progs.src
#	qcsrc/common/monsters/sv_monsters.qc
#	qcsrc/common/triggers/teleporters.qc
#	qcsrc/common/vehicles/sv_vehicles.qh
#	qcsrc/server/g_damage.qc
#	qcsrc/server/g_damage.qh
#	qcsrc/server/mutators/mutators_include.qc

diff --cc qcsrc/client/damage.qc
Simple merge

diff --cc qcsrc/client/main.qc
Simple merge

diff --cc qcsrc/client/progs.src
index 49b5640ae4796361b0d975b055469588d954681f,88eba6d4bba4307340778c75432f76c6347cf6fd..6a427b464d6dae2d534e15f942ddbfd2f7f896d6
--- 1/qcsrc/client/progs.src
--- 2/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -55,15 -56,12 +55,15 @@@ weapons/projectile.qc // TOD
  
  ../common/viewloc.qc
  
- ../common/weapons/all.qc // TODO
- 
  ../common/items/all.qc
- 
  ../common/monsters/all.qc
- 
+ ../common/mutators/all.qc
+ ../common/vehicles/all.qc
+ ../common/weapons/all.qc
+ 
 +../common/turrets/cl_turrets.qc
 +../common/turrets/turrets.qc
 +
  ../common/triggers/include.qc
  
  ../csqcmodellib/cl_model.qc

diff --cc qcsrc/common/monsters/sv_monsters.qc
index b453ba25714c26942dc1308adb50660cd372ff11,f9660c02f5553c63a38e30e03cfbdf2851fd01cb..249e6f97eb768be7fed885364f200b0915d91baf
--- 1/qcsrc/common/monsters/sv_monsters.qc
--- 2/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@@ -14,10 -14,8 +14,10 @@@
      #include "../../server/defs.qh"
      #include "../deathtypes.qh"
      #include "../../server/mutators/mutators_include.qh"
-     #include "../../server/steerlib.qh"
-     #include "../turrets/sv_turrets.qh"
-     #include "../turrets/util.qh"
-     #include "../vehicles/sv_vehicles.qh"
 -    #include "../../server/tturrets/include/turrets_early.qh"
++      #include "../../server/steerlib.qh"
++      #include "../turrets/sv_turrets.qh"
++      #include "../turrets/util.qh"
+     #include "../vehicles/all.qh"
      #include "../../server/campaign.qh"
      #include "../../server/command/common.qh"
      #include "../../server/command/cmd.qh"

diff --cc qcsrc/common/triggers/teleporters.qc
index 5cd0981005538a7a86d0790f71a3f51069affc28,25b18dd0955ab6c4e75a423c9f44939f43d5d846..89a5fa20df1cef803ab61357d98e06e06d3ffd24
--- 1/qcsrc/common/triggers/teleporters.qc
--- 2/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@@ -15,8 -15,8 +15,8 @@@
      #include "../../server/constants.qh"
      #include "../../server/defs.qh"
      #include "../deathtypes.qh"
 -    #include "../../server/tturrets/include/turrets_early.qh"
 +    #include "../turrets/sv_turrets.qh"
-     #include "../vehicles/sv_vehicles.qh"
+     #include "../vehicles/all.qh"
      #include "../mapinfo.qh"
      #include "../../server/anticheat.qh"
  #endif

diff --cc qcsrc/common/vehicles/sv_vehicles.qh
index 6c0a6bd17937b415c24da322afb6086ff5b41c5c,b1921371eeb4aef14f19e57ec427ccd08c464a78..b3f252e3b12597ed22b4bbae58ce9711c297bf19
--- 1/qcsrc/common/vehicles/sv_vehicles.qh
--- 2/qcsrc/common/vehicles/sv_vehicles.qh
+++ b/qcsrc/common/vehicles/sv_vehicles.qh
@@@ -2,8 -2,7 +2,7 @@@
  #define VEHICLES_DEF_H
  #ifdef SVQC
  
 -#include "../../server/tturrets/include/turrets_early.qh"
 +#include "../turrets/sv_turrets.qh"
- #include "sv_vehicles.qh"
  
  // #define VEHICLES_USE_ODE
  

diff --cc qcsrc/server/g_damage.qc
index ba9ed8898a1a59793f9a1e38f7706a62a5c25752,0721e885210de95188de6b70b6899864fafbc8d9..9791bbd2933ceac46d4e54e91fc7f0a6132978ad
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -6,8 -6,9 +6,8 @@@
  #include "scores.qh"
  #include "waypointsprites.qh"
  #include "spawnpoints.qh"
 -#include "tturrets/include/turrets_early.qh"
  #include "t_items.qh"
- #include "../common/vehicles/sv_vehicles.qh"
+ #include "../common/vehicles/all.qh"
  #include "weapons/accuracy.qh"
  #include "weapons/csqcprojectile.qh"
  #include "weapons/selection.qh"
@@@ -844,7 -845,7 +844,7 @@@ void Damage (entity targ, entity inflic
                        else
                                victim = targ;
  
-                       if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim))
 -                      if(IS_PLAYER(victim) || IS_TURRET(victim) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim))
++                      if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim))
                        {
                                if(DIFF_TEAM(victim, attacker) && !victim.frozen)
                                {

diff --cc qcsrc/server/g_damage.qh
index a7916957d3f4c6c50153e4b573a322c48c8be847,98e9c987194c670445f3a80455b1ceec90a902e5..8d7db7f5dcf05a46e3804b0acf2d5aa16de0731d
--- 1/qcsrc/server/g_damage.qh
--- 2/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@@ -21,8 -21,8 +21,8 @@@
      #include "../common/notifications.qh"
      #include "../common/deathtypes.qh"
      #include "mutators/mutators_include.qh"
 -    #include "tturrets/include/turrets_early.qh"
 +    #include "../common/turrets/sv_turrets.qh"
-     #include "../common/vehicles/sv_vehicles.qh"
+     #include "../common/vehicles/all.qh"
      #include "../csqcmodellib/sv_model.qh"
      #include "../common/playerstats.qh"
      #include "g_hook.qh"

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

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

diff --cc qcsrc/server/mutators/gamemode_onslaught.qc
index 06b65cad589df7aaec2c0af0753862fc61e25841,299656dcff0f7ed6b14a689f3f3b4f90fd7069e0..f5ca947f7a88cf2cbd4ea2846eea16730bf2deda
--- 1/qcsrc/server/mutators/gamemode_onslaught.qc
--- 2/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@@ -1709,9 -1701,9 +1715,10 @@@ MUTATOR_DEFINITION(gamemode_onslaught
        MUTATOR_HOOK(BuildMutatorsPrettyString, ons_BuildMutatorsPrettyString, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsString, ons_BuildMutatorsString, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerSpawn, ons_PlayerSpawn, CBC_ORDER_ANY);
 +      MUTATOR_HOOK(TurretSpawn, ons_TurretSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(MonsterMove, ons_MonsterThink, CBC_ORDER_ANY);
        MUTATOR_HOOK(MonsterSpawn, ons_MonsterSpawn, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayHitsound, ons_PlayHitsound, CBC_ORDER_ANY);
        //MUTATOR_HOOK(Spawn_Score, ons_Spawn_Score, CBC_ORDER_ANY);
  
        MUTATOR_ONADD

diff --cc qcsrc/server/mutators/mutators_include.qc
index 7a241e4e750e2bbd532072998cdcc41a7c25cb09,c6f28cb529b00c185719e8a508ddf7fff9767f64..3129af92fab7b677150a3079c500de194ef8cdf6
--- 1/qcsrc/server/mutators/mutators_include.qc
--- 2/qcsrc/server/mutators/mutators_include.qc
+++ b/qcsrc/server/mutators/mutators_include.qc
@@@ -45,8 -45,8 +45,8 @@@
      #include "../../common/notifications.qh"
      #include "../../common/deathtypes.qh"
      #include "mutators_include.qh"
 -    #include "../tturrets/include/turrets_early.qh"
 +    #include "../../common/turrets/sv_turrets.qh"
-     #include "../../common/vehicles/sv_vehicles.qh"
+     #include "../../common/vehicles/all.qh"
      #include "../campaign.qh"
      #include "../../common/campaign_common.qh"
      #include "../../common/mapinfo.qh"
@@@ -75,7 -75,7 +75,7 @@@
      #include "../round_handler.qh"
      #include "../item_key.qh"
      #include "../pathlib/pathlib.qh"
-     #include "../../common/vehicles/vehicles.qh"
 -    #include "../tturrets/include/turrets.qh"
++    #include "../../common/vehicles/all.qh"
  #endif
  
  #include "../../common/mutators/base.qh"

diff --cc qcsrc/server/progs.src
index 10113b0de0caf2515e3013f917b01c24f894681d,e5251bef3fe3ddab780b83f5bffc4d0c5e61aa50..16769c8a6a1fe94b038ff2365fdcb9895bc4c88e
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -102,18 -101,14 +101,20 @@@ weapons/weaponsystem.q
  ../common/triggers/include.qc
  ../common/urllib.qc
  ../common/util.qc
- ../common/vehicles/vehicles_include.qc
  
  ../common/items/all.qc
+ ../common/monsters/all.qc
+ ../common/mutators/all.qc
+ ../common/vehicles/all.qc
+ ../common/weapons/all.qc // TODO
  
 +../common/turrets/sv_turrets.qc
 +../common/turrets/config.qc
 +../common/turrets/util.qc
 +../common/turrets/turrets.qc
 +../common/turrets/checkpoint.qc
 +../common/turrets/targettrigger.qc
  ../common/weapons/config.qc
- ../common/weapons/all.qc // TODO
  
  ../csqcmodellib/sv_model.qc