Merge remote branch 'origin/master' into samual/keepaway

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index d1d0d1d3af9677dc9f6470d359a82707ee8f7b9c..1e6e057b2f7b030635be77885c6d305de3e13925 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -1,6 +1,7 @@
 ../../progs.dat // output filename
 
 ../common/util-pre.qh
+
 sys.qh
 pre-builtins.qh
 builtins.qh
@@ -13,11 +14,12 @@ post-builtins.qh
 ../warpzonelib/util_server.qh
 ../warpzonelib/server.qh
 
-constants.qh
 ../common/constants.qh
 ../common/util.qh
 ../common/items.qh
 
+autocvars.qh
+constants.qh
 defs.qh                // Should rename this, it has fields and globals
 
 mutators/base.qh
@@ -33,6 +35,7 @@ campaign.qh
 ../common/mapinfo.qh
 ../common/util.qc
 
+accuracy.qh
 csqcprojectile.qh
 csqceffects.qc
 
@@ -42,6 +45,8 @@ cheats.qh
 portals.qh
 
 g_hook.qh
+w_electro.qh
+w_laser.qh
 
 scores.qh
 
@@ -78,7 +83,6 @@ teamplay.qc
 cl_physics.qc
 
 // tZork's libs
-verbstack.qc
 movelib.qc
 steerlib.qc
 pathlib/pathlib.qh
@@ -165,6 +169,7 @@ monsters/fight.qc
 monsters/ai.qc
 monsters/m_monsters.qc
 monsters/monster_zombie.qc
+accuracy.qc
 csqcprojectile.qc
 
 playerdemo.qc
@@ -174,8 +179,11 @@ cheats.qc
 
 mutators/base.qc
 mutators/gamemode_keyhunt.qc
+mutators/gamemode_keepaway.qc
 mutators/mutator_nix.qc
 mutators/mutator_dodging.qc
+mutators/mutator_rocketflying.qc
+mutators/mutator_vampire.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc