Merge branch 'master' into TimePath/vehicles_cleanup
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 07:13:46 +0000 (17:13 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 07:13:46 +0000 (17:13 +1000)
# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/server/progs.src

1  2 
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/server/g_damage.qc
qcsrc/server/progs.src

  #include "wall.qh"
  #include "waypointsprites.qh"
  
 -#include "mutators/events.qh"
 -
 -#include "../common/vehicles/unit/bumblebee.qh"
 -#include "../common/vehicles/cl_vehicles.qh"
 -#include "../common/vehicles/vehicles.qh"
 +#include "../common/vehicles/all.qh"
  
+ #include "mutators/events.qh"
  #include "weapons/projectile.qh"
  
  #include "../common/buffs.qh"
@@@ -57,9 -57,12 +57,10 @@@ weapons/projectile.qc // TOD
  ../common/viewloc.qc
  
  ../common/items/all.qc
 -
  ../common/monsters/all.qc
 -
+ ../common/mutators/all.qc
 -
 -../common/weapons/all.qc // TODO
 +../common/vehicles/all.qc
 +../common/weapons/all.qc
  
  ../common/triggers/include.qc
  
Simple merge
@@@ -101,13 -103,12 +101,14 @@@ 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/weapons/config.qc
 -../common/weapons/all.qc // TODO
  
  ../csqcmodellib/sv_model.qc