Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 0ebe6d9fb5aaabd606c88b3c31e0f9cd0688dd95..2a733728c532e9a32978a303e6f80979937af702 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -13,14 +13,18 @@ sys-post.qh
 ../warpzonelib/server.qh
 
 ../common/constants.qh
+../common/teams.qh
 ../common/util.qh
 ../common/items.qh
+../common/deathtypes.qh
+../common/notifications.qh
 ../common/explosion_equation.qh
 ../common/urllib.qh
 ../common/command/markup.qh
 ../common/command/rpn.qh
 ../common/command/generic.qh
 ../common/command/shared_defs.qh
+../common/net_notice.qh
 
 autocvars.qh
 constants.qh
@@ -28,8 +32,10 @@ defs.qh              // Should rename this, it has fields and globals
 
 mutators/base.qh
 mutators/mutators.qh
-mutators/gamemode_ctf.qh // for spawnfuncs
+mutators/gamemode_ctf.qh
 mutators/gamemode_keyhunt.qh // TODO fix this
+mutators/gamemode_keepaway.qh
+mutators/gamemode_nexball.qh 
 mutators/mutator_dodging.qh
 
 //// tZork Turrets ////
@@ -139,8 +145,8 @@ antilag.qc
 
 //ctf.qc
 domination.qc
-mode_onslaught.qc
-nexball.qc
+//mode_onslaught.qc
+//nexball.qc
 g_hook.qc
 
 t_swamp.qc
@@ -153,6 +159,8 @@ campaign.qc
 ../common/command/markup.qc
 ../common/command/rpn.qc
 ../common/command/generic.qc
+../common/net_notice.qc
+
 command/common.qc
 command/banning.qc
 command/radarmap.qc
@@ -203,16 +211,21 @@ playerstats.qc
 
 mutators/base.qc
 mutators/gamemode_ctf.qc
-mutators/gamemode_keyhunt.qc
 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
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
@@ -221,5 +234,6 @@ mutators/sandbox.qc
 ../warpzonelib/server.qc
 
 ../common/util.qc
+../common/notifications.qc
 
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail