From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 23 Aug 2015 07:13:46 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/vehicles_cleanup
X-Git-Tag: xonotic-v0.8.2~2053^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c7352309564fc88b28216e0aa9ac509ce4d3dc6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/vehicles_cleanup

# Conflicts:
#	qcsrc/client/main.qc
#	qcsrc/client/progs.src
#	qcsrc/server/progs.src
---

4c7352309564fc88b28216e0aa9ac509ce4d3dc6
diff --cc qcsrc/client/main.qc
index 752b518ba,a585a136e..ca3fb3093
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -23,8 -23,14 +23,10 @@@
  #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"
diff --cc qcsrc/client/progs.src
index 1c739ab76,43c056aa3..88eba6d4b
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -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
  
diff --cc qcsrc/server/progs.src
index e13a760cb,bb6288101..e5251bef3
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -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