Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index d23663531d25652f77ef84302af146f443c8415a..fcc82ed08557e6b0008acd229f2b482a46a515f0 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -21,6 +21,8 @@ sys-post.qh
 ../common/command/rpn.qh
 ../common/command/generic.qh
 ../common/command/shared_defs.qh
+../common/net_notice.qh
+../common/animdecide.qh
 
 autocvars.qh
 constants.qh
@@ -28,7 +30,12 @@ defs.qh              // Should rename this, it has fields and globals
 
 mutators/base.qh
 mutators/mutators.qh
+mutators/gamemode_arena.qh
+mutators/gamemode_ca.qh
+mutators/gamemode_ctf.qh
+mutators/gamemode_domination.qh
 mutators/gamemode_keyhunt.qh // TODO fix this
+mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
 mutators/mutator_dodging.qh
 
@@ -75,6 +82,8 @@ antilag.qh
 
 playerdemo.qh
 
+round_handler.qh
+
 // singleplayer stuff
 item_key.qh
 secret.qh
@@ -92,7 +101,6 @@ g_subs.qc
 g_tetris.qc
 
 runematch.qc
-arena.qc
 
 g_violence.qc
 g_damage.qc
@@ -137,9 +145,9 @@ cl_client.qc
 t_plats.qc
 antilag.qc
 
-ctf.qc
-domination.qc
-mode_onslaught.qc
+//ctf.qc
+//domination.qc
+//mode_onslaught.qc
 //nexball.qc
 g_hook.qc
 
@@ -153,6 +161,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
@@ -199,20 +209,30 @@ anticheat.qc
 cheats.qc
 playerstats.qc
 
+round_handler.qc
+
 ../common/explosion_equation.qc
 
 mutators/base.qc
-mutators/gamemode_nexball.qc
-mutators/gamemode_keyhunt.qc
+mutators/gamemode_arena.qc
+mutators/gamemode_ca.qc
+mutators/gamemode_ctf.qc
+mutators/gamemode_domination.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
@@ -220,6 +240,7 @@ mutators/sandbox.qc
 ../warpzonelib/util_server.qc
 ../warpzonelib/server.qc
 
+../common/animdecide.qc
 ../common/util.qc
 
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail