Merge branch 'master' into Mario/turrets
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 08:56:02 +0000 (18:56 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 08:56:47 +0000 (18:56 +1000)
# 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

13 files changed:
1  2 
qcsrc/client/damage.qc
qcsrc/client/main.qc
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/g_world.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/progs.src

Simple merge
Simple merge
@@@ -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
      #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"
@@@ -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
@@@ -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
  
@@@ -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)
                                {
@@@ -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"
Simple merge
@@@ -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
@@@ -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"
@@@ -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