Merge remote branch 'origin/master' into samual/updatecommands

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index b79c759e817615ae71d9177cb75f830919e21311..2a8e9e93b63a79a7cd42dc709fe75178a718d630 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -1,11 +1,15 @@
 ../../csprogs.dat
+
+sys-pre.qh
+../dpdefs/csprogsdefs.qc
+sys-post.qh
+
 pre.qh
 
 ../common/util-pre.qh
 Defs.qc
-csqc_constants.qc
+../dpdefs/keycodes.qc
 ../common/constants.qh
-csqc_builtins.qc
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
@@ -29,8 +33,12 @@ movetypes.qh
 prandom.qh
 bgmscript.qh
 noise.qh
-
+teamplay.qh
+tturrets.qh
+../server/tturrets/include/turrets_early.qh
+../server/movelib.qc
 main.qh
+vehicles/vehicles.qh
 
 sortlist.qc
 miscfunctions.qc
@@ -39,6 +47,7 @@ teamplay.qc
 ctf.qc
 
 teamradar.qc
+hud_config.qc
 hud.qc
 scoreboard.qc
 mapvoting.qc
@@ -57,7 +66,11 @@ modeleffects.qc
 tuba.qc
 target_music.qc
 
-//vehicles/spiderbot.qc
+vehicles/vehicles.qc
+shownames.qh
+shownames.qc
+
+announcer.qc
 Main.qc
 View.qc
 interpolate.qc
@@ -66,6 +79,7 @@ movetypes.qc
 prandom.qc
 bgmscript.qc
 noise.qc
+gamecommand.qc
 
 ../common/util.qc
 ../common/gamecommand.qc
@@ -78,3 +92,6 @@ noise.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc
 ../warpzonelib/client.qc
+tturrets.qc
+
+../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail