Merge branch 'master' into mario/mutator_minstagib

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index c20090022f54d163e3a9c137d8c92483174e31f6..67100fbea222f24cce4d502a3e9e028da835f32f 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -31,6 +31,7 @@ mutators/base.qh
 mutators/mutators.qh
 mutators/gamemode_ctf.qh
 mutators/gamemode_keyhunt.qh // TODO fix this
+mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
 mutators/mutator_dodging.qh
 
@@ -141,7 +142,7 @@ antilag.qc
 
 //ctf.qc
 domination.qc
-mode_onslaught.qc
+//mode_onslaught.qc
 //nexball.qc
 g_hook.qc
 
@@ -211,13 +212,18 @@ mutators/gamemode_freezetag.qc
 mutators/gamemode_keyhunt.qc
 mutators/gamemode_keepaway.qc
 mutators/gamemode_nexball.qc
+mutators/gamemode_onslaught.qc
 mutators/mutator_invincibleproj.qc
+mutators/mutator_new_toys.qc
 mutators/mutator_nix.qc
 mutators/mutator_dodging.qc
 mutators/mutator_rocketflying.qc
 mutators/mutator_vampire.qc
 mutators/mutator_spawn_near_teammate.qc
+mutators/mutator_physical_items.qc
 mutators/sandbox.qc
+mutators/mutator_superspec.qc
+mutators/mutator_minstagib.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc