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

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 1ede5759485da4fb1300f7c3a3a03c8569c2e59c..39c29037a0be3b10ba18af7df71c1bb835cddb5e 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -17,8 +17,11 @@ sys-post.qh
 ../common/items.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
@@ -26,7 +29,9 @@ defs.qh               // Should rename this, it has fields and globals
 
 mutators/base.qh
 mutators/mutators.qh
+mutators/gamemode_ctf.qh
 mutators/gamemode_keyhunt.qh // TODO fix this
+mutators/gamemode_nexball.qh 
 mutators/mutator_dodging.qh
 
 //// tZork Turrets ////
@@ -36,17 +41,20 @@ vehicles/vehicles_def.qh
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
-../common/util.qc
 
 command/common.qh
-command/ipban.qh
+command/banning.qh
 command/radarmap.qh
 command/vote.qh
+command/getreplies.qh
 command/cmd.qh
 command/sv_cmd.qh
 
 accuracy.qh
 csqcprojectile.qh
+../common/csqcmodel_settings.qh
+../csqcmodellib/common.qh
+../csqcmodellib/sv_model.qh
 csqceffects.qc
 
 anticheat.qh
@@ -131,10 +139,10 @@ cl_client.qc
 t_plats.qc
 antilag.qc
 
-ctf.qc
+//ctf.qc
 domination.qc
-mode_onslaught.qc
-nexball.qc
+//mode_onslaught.qc
+//nexball.qc
 g_hook.qc
 
 t_swamp.qc
@@ -144,11 +152,16 @@ campaign.qc
 ../common/campaign_setup.qc
 ../common/urllib.qc
 
+../common/command/markup.qc
+../common/command/rpn.qc
 ../common/command/generic.qc
+../common/net_notice.qc
+
 command/common.qc
-command/ipban.qc
+command/banning.qc
 command/radarmap.qc
 command/vote.qc
+command/getreplies.qc
 command/cmd.qc
 command/sv_cmd.qc
 
@@ -181,6 +194,7 @@ target_music.qc
 
 
 accuracy.qc
+../csqcmodellib/sv_model.qc
 csqcprojectile.qc
 
 playerdemo.qc
@@ -192,16 +206,21 @@ playerstats.qc
 ../common/explosion_equation.qc
 
 mutators/base.qc
-mutators/gamemode_keyhunt.qc
+mutators/gamemode_ctf.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/sandbox.qc
+mutators/mutator_superspec.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
@@ -209,4 +228,6 @@ mutators/sandbox.qc
 ../warpzonelib/util_server.qc
 ../warpzonelib/server.qc
 
+../common/util.qc
+
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail