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 b3cc22ddaa7a785c9a44472025a74e1b0cde3cb3..e8f388e6cfc2dfb6e1361d02f20b2d174d315666 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -45,11 +45,16 @@ mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
 mutators/gamemode_lms.qh
 mutators/mutator_dodging.qh
+mutators/gamemode_towerdefense.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
@@ -199,6 +204,8 @@ scores.qc
 
 portals.qc
 
+generator.qc
+
 target_spawn.qc
 func_breakable.qc
 target_music.qc
@@ -220,6 +227,8 @@ round_handler.qc
 
 ../common/explosion_equation.qc
 
+monsters/monsters.qh
+
 mutators/base.qc
 mutators/gamemode_assault.qc
 mutators/gamemode_arena.qc
@@ -231,6 +240,7 @@ mutators/gamemode_keyhunt.qc
 mutators/gamemode_keepaway.qc
 mutators/gamemode_nexball.qc
 mutators/gamemode_onslaught.qc
+mutators/gamemode_towerdefense.qc
 mutators/gamemode_lms.qc
 mutators/mutator_invincibleproj.qc
 mutators/mutator_new_toys.qc