Merge branch 'master' into Mario/race_cts_mutators

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index bea1f8784258ddb03593f016efcc39b5909c2fa1..07683fc16680bcad7385ec3a538f2590d47d7c05 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -13,8 +13,10 @@ sys-post.qh
 ../warpzonelib/server.qh
 
 ../common/constants.qh
+../common/stats.qh
 ../common/teams.qh
 ../common/util.qh
+../common/buffs.qh
 ../common/test.qh
 ../common/counting.qh
 ../common/items.qh
@@ -26,6 +28,9 @@ sys-post.qh
 ../common/command/shared_defs.qh
 ../common/net_notice.qh
 ../common/animdecide.qh
+../common/monsters/monsters.qh
+../common/monsters/sv_monsters.qh
+../common/monsters/spawn.qh
 
 autocvars.qh
 constants.qh
@@ -37,7 +42,6 @@ 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
 mutators/gamemode_domination.qh
@@ -45,17 +49,17 @@ mutators/gamemode_keyhunt.qh // TODO fix this
 mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
 mutators/gamemode_lms.qh
+mutators/gamemode_invasion.qh
+mutators/gamemode_cts.qh
+mutators/gamemode_race.qh
 mutators/mutator_dodging.qh
-mutators/gamemode_towerdefense.qh
+mutators/mutator_nades.qh
+mutators/mutator_buffs.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
@@ -89,6 +93,8 @@ scores.qh
 
 spawnpoints.qh
 
+mapvoting.qh
+
 ipban.qh
 
 race.qh
@@ -132,6 +138,8 @@ pathlib/pathlib.qh
 g_world.qc
 g_casings.qc
 
+mapvoting.qc
+
 t_jumppads.qc
 t_teleporters.qc
 
@@ -209,14 +217,14 @@ spawnpoints.qc
 
 portals.qc
 
-generator.qc
-
 target_spawn.qc
 func_breakable.qc
 target_music.qc
 
 ../common/items.qc
 
+../common/buffs.qc
+
 
 accuracy.qc
 ../csqcmodellib/sv_model.qc
@@ -232,11 +240,13 @@ round_handler.qc
 
 ../common/explosion_equation.qc
 
-monsters/monsters.qh
+../common/monsters/sv_monsters.qc
+../common/monsters/monsters.qc
+
+../common/monsters/spawn.qc
 
 mutators/base.qc
 mutators/gamemode_assault.qc
-mutators/gamemode_arena.qc
 mutators/gamemode_ca.qc
 mutators/gamemode_ctf.qc
 mutators/gamemode_domination.qc
@@ -245,8 +255,10 @@ 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/gamemode_invasion.qc
+mutators/gamemode_cts.qc
+mutators/gamemode_race.qc
 mutators/mutator_invincibleproj.qc
 mutators/mutator_new_toys.qc
 mutators/mutator_nix.qc
@@ -259,6 +271,15 @@ mutators/sandbox.qc
 mutators/mutator_superspec.qc
 mutators/mutator_minstagib.qc
 mutators/mutator_touchexplode.qc
+mutators/mutator_pinata.qc
+mutators/mutator_midair.qc
+mutators/mutator_bloodloss.qc
+mutators/mutator_random_gravity.qc
+mutators/mutator_multijump.qc
+mutators/mutator_melee_only.qc
+mutators/mutator_nades.qc
+mutators/mutator_campcheck.qc
+mutators/mutator_buffs.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
@@ -270,5 +291,3 @@ mutators/mutator_touchexplode.qc
 ../common/test.qc
 ../common/util.qc
 ../common/notifications.qc
-
-../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail