Merge remote 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 0ebe6d9fb5aaabd606c88b3c31e0f9cd0688dd95..c20090022f54d163e3a9c137d8c92483174e31f6 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -21,6 +21,7 @@ sys-post.qh
 ../common/command/rpn.qh
 ../common/command/generic.qh
 ../common/command/shared_defs.qh
 ../common/command/rpn.qh
 ../common/command/generic.qh
 ../common/command/shared_defs.qh

+../common/net_notice.qh

 
 autocvars.qh
 constants.qh
 
 autocvars.qh
 constants.qh


@@ -28,8 +29,9 @@ defs.qh               // Should rename this, it has fields and globals
 
 mutators/base.qh
 mutators/mutators.qh
 
 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_keyhunt.qh // TODO fix this

+mutators/gamemode_nexball.qh 

 mutators/mutator_dodging.qh
 
 //// tZork Turrets ////
 mutators/mutator_dodging.qh
 
 //// tZork Turrets ////


@@ -140,7 +142,7 @@ antilag.qc
 //ctf.qc
 domination.qc
 mode_onslaught.qc
 //ctf.qc
 domination.qc
 mode_onslaught.qc

-nexball.qc
+//nexball.qc

 g_hook.qc
 
 t_swamp.qc
 g_hook.qc
 
 t_swamp.qc


@@ -153,6 +155,8 @@ campaign.qc
 ../common/command/markup.qc
 ../common/command/rpn.qc
 ../common/command/generic.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
 command/common.qc
 command/banning.qc
 command/radarmap.qc


@@ -203,9 +207,10 @@ playerstats.qc
 
 mutators/base.qc
 mutators/gamemode_ctf.qc
 
 mutators/base.qc
 mutators/gamemode_ctf.qc

-mutators/gamemode_keyhunt.qc

 mutators/gamemode_freezetag.qc
 mutators/gamemode_freezetag.qc

+mutators/gamemode_keyhunt.qc

 mutators/gamemode_keepaway.qc
 mutators/gamemode_keepaway.qc

+mutators/gamemode_nexball.qc

 mutators/mutator_invincibleproj.qc
 mutators/mutator_nix.qc
 mutators/mutator_dodging.qc
 mutators/mutator_invincibleproj.qc
 mutators/mutator_nix.qc
 mutators/mutator_dodging.qc