Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index adf4b4a1d89545418734228dddc0b16345100f0a..8d0ef2748bff9d15fab49de1452795d8d24efa74 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -1,12 +1,12 @@
 ../../progs.dat // output filename
 
 ../common/util-pre.qh
+
 sys.qh
 pre-builtins.qh
 builtins.qh
 extensions.qh
 post-builtins.qh
-autocvars.qh
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
@@ -14,11 +14,13 @@ autocvars.qh
 ../warpzonelib/util_server.qh
 ../warpzonelib/server.qh
 
-constants.qh
 ../common/constants.qh
 ../common/util.qh
 ../common/items.qh
+../common/explosion_equation.qh
 
+autocvars.qh
+constants.qh
 defs.qh                // Should rename this, it has fields and globals
 
 mutators/base.qh
@@ -28,17 +30,20 @@ mutators/mutator_dodging.qh
 
 //// tZork Turrets ////
 tturrets/include/turrets_early.qh
+vehicles/vehicles_def.qh
 
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
 ../common/util.qc
 
+accuracy.qh
 csqcprojectile.qh
 csqceffects.qc
 
 anticheat.qh
 cheats.qh
+playerstats.qh
 
 portals.qh
 
@@ -81,7 +86,6 @@ teamplay.qc
 cl_physics.qc
 
 // tZork's libs
-verbstack.qc
 movelib.qc
 steerlib.qc
 pathlib/pathlib.qh
@@ -168,20 +172,30 @@ monsters/fight.qc
 monsters/ai.qc
 monsters/m_monsters.qc
 monsters/monster_zombie.qc
+accuracy.qc
 csqcprojectile.qc
 
 playerdemo.qc
 
 anticheat.qc
 cheats.qc
+playerstats.qc
+
+../common/explosion_equation.qc
 
 mutators/base.qc
 mutators/gamemode_keyhunt.qc
+mutators/gamemode_freezetag.qc
+mutators/gamemode_keepaway.qc
 mutators/mutator_nix.qc
 mutators/mutator_dodging.qc
+mutators/mutator_rocketflying.qc
+mutators/mutator_vampire.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc
 ../warpzonelib/util_server.qc
 ../warpzonelib/server.qc
+
+../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail