Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index e16e4e969a809fce1e66e548aa2264c1fcf5e5ae..d446d1bd3cf68b4a8df4427694c18b8dc3e3b292 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -15,6 +15,7 @@ sys-post.qh
 ../common/constants.qh
 ../common/teams.qh
 ../common/util.qh
+../common/test.qh
 ../common/counting.qh
 ../common/items.qh
 ../common/explosion_equation.qh
@@ -44,12 +45,18 @@ mutators/gamemode_keyhunt.qh // TODO fix this
 mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
 mutators/gamemode_lms.qh
+mutators/gamemode_invasion.qh
 mutators/mutator_dodging.qh
+mutators/mutator_nades.qh
 
 //// tZork Turrets ////
 tturrets/include/turrets_early.qh
 vehicles/vehicles_def.qh
 
+monsters/lib/monsters_early.qh
+
+generator.qh
+
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
@@ -203,6 +210,8 @@ spawnpoints.qc
 
 portals.qc
 
+generator.qc
+
 target_spawn.qc
 func_breakable.qc
 target_music.qc
@@ -224,6 +233,8 @@ round_handler.qc
 
 ../common/explosion_equation.qc
 
+monsters/monsters.qh
+
 mutators/base.qc
 mutators/gamemode_assault.qc
 mutators/gamemode_arena.qc
@@ -236,6 +247,7 @@ mutators/gamemode_keepaway.qc
 mutators/gamemode_nexball.qc
 mutators/gamemode_onslaught.qc
 mutators/gamemode_lms.qc
+mutators/gamemode_invasion.qc
 mutators/mutator_invincibleproj.qc
 mutators/mutator_new_toys.qc
 mutators/mutator_nix.qc
@@ -252,7 +264,10 @@ 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_melee_only.qc
+mutators/mutator_nades.qc
+mutators/mutator_campcheck.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
@@ -261,6 +276,7 @@ mutators/mutator_norecoil.qc
 ../warpzonelib/server.qc
 
 ../common/animdecide.qc
+../common/test.qc
 ../common/util.qc
 ../common/notifications.qc