Merge branch 'Mario/nades_mutator' into Mario/mutators

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 28736e6cdb279f2ff0ee8762b8520f18cc7018ba..db5f4165d79861e7faaf09550a09b31a51862332 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -35,6 +35,7 @@ defs.qh               // Should rename this, it has fields and globals
 
 mutators/base.qh
 mutators/mutators.qh
+mutators/gamemode_assault.qh
 mutators/gamemode_arena.qh
 mutators/gamemode_ca.qh
 mutators/gamemode_ctf.qh
@@ -80,6 +81,8 @@ w_laser.qh
 
 scores.qh
 
+spawnpoints.qh
+
 ipban.qh
 
 race.qh
@@ -177,7 +180,7 @@ command/getreplies.qc
 command/cmd.qc
 command/sv_cmd.qc
 
-assault.qc
+//assault.qc
 
 ipban.qc
 
@@ -196,6 +199,8 @@ vehicles/vehicles.qh
 
 scores.qc
 
+spawnpoints.qc
+
 portals.qc
 
 target_spawn.qc
@@ -220,6 +225,7 @@ round_handler.qc
 ../common/explosion_equation.qc
 
 mutators/base.qc
+mutators/gamemode_assault.qc
 mutators/gamemode_arena.qc
 mutators/gamemode_ca.qc
 mutators/gamemode_ctf.qc
@@ -240,7 +246,17 @@ mutators/mutator_spawn_near_teammate.qc
 mutators/mutator_physical_items.qc
 mutators/sandbox.qc
 mutators/mutator_superspec.qc
-mutators/mutator_touchexplode.qc
+mutators/mutator_minstagib.qc
+mutators/mutator_pinata.qc
+mutators/mutator_midair.qc
+mutators/mutator_bloodloss.qc
+mutators/mutator_random_gravity.qc
+mutators/mutator_norecoil.qc
+mutators/mutator_multijump.qc
+mutators/mutator_jump_grunt.qc
+mutators/mutator_footsteps.qc
+mutators/mutator_melee_only.qc
+mutators/mutator_nades.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc