Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / progs.src

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index e5251bef3fe3ddab780b83f5bffc4d0c5e61aa50..16769c8a6a1fe94b038ff2365fdcb9895bc4c88e 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -108,6 +108,12 @@ weapons/weaponsystem.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
 
 ../csqcmodellib/sv_model.qc