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 3c3ba5bb515bd92baa3bc21f66a3a45971bf9e3e..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,13 +14,19 @@ 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
+mutators/mutators.qh
+mutators/gamemode_keyhunt.qh // TODO fix this
+mutators/mutator_dodging.qh
+
 //// tZork Turrets ////
 tturrets/include/turrets_early.qh
 
@@ -28,6 +35,7 @@ campaign.qh
 ../common/mapinfo.qh
 ../common/util.qc
 
+accuracy.qh
 csqcprojectile.qh
 csqceffects.qc
 
@@ -37,6 +45,8 @@ cheats.qh
 portals.qh
 
 g_hook.qh
+w_electro.qh
+w_laser.qh
 
 scores.qh
 
@@ -44,8 +54,6 @@ ipban.qh
 
 race.qh
 
-keyhunt.qh
-
 antilag.qh
 
 vote.qh
@@ -75,7 +83,6 @@ teamplay.qc
 cl_physics.qc
 
 // tZork's libs
-verbstack.qc
 movelib.qc
 steerlib.qc
 pathlib/pathlib.qh
@@ -127,8 +134,6 @@ campaign.qc
 ../common/gamecommand.qc
 gamecommand.qc
 
-keyhunt.qc
-
 assault.qc
 
 ipban.qc
@@ -155,6 +160,7 @@ portals.qc
 
 target_spawn.qc
 func_breakable.qc
+target_music.qc
 
 ../common/items.qc
 
@@ -163,6 +169,7 @@ monsters/fight.qc
 monsters/ai.qc
 monsters/m_monsters.qc
 monsters/monster_zombie.qc
+accuracy.qc
 csqcprojectile.qc
 
 playerdemo.qc
@@ -170,6 +177,14 @@ playerdemo.qc
 anticheat.qc
 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
 ../warpzonelib/common.qc