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

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 7f31cacf2bb779ab769c98462771354af9922f1f..3b8aa1bace9adc8970b782b4388416bda44dadc5 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -14,14 +14,27 @@ Defs.qc
 ../warpzonelib/common.qh
 ../warpzonelib/client.qh
 
+../common/teams.qh
 ../common/util.qh
+../common/counting.qh
 ../common/items.qh
 ../common/explosion_equation.qh
-
 ../common/mapinfo.qh
+../common/command/markup.qh
+../common/command/rpn.qh
+../common/command/generic.qh
+../common/command/shared_defs.qh
+../common/urllib.qh
+../common/animdecide.qh
+command/cl_cmd.qh
 
 autocvars.qh
 
+../common/notifications.qh // must be after autocvars
+../common/deathtypes.qh // must be after notifications
+
+damage.qh
+
 ../csqcmodellib/interpolate.qh
 teamradar.qh
 hud.qh
@@ -31,7 +44,6 @@ movetypes.qh
 prandom.qh
 bgmscript.qh
 noise.qh
-teamplay.qh
 tturrets.qh
 ../server/tturrets/include/turrets_early.qh
 ../server/movelib.qc
@@ -42,10 +54,11 @@ vehicles/vehicles.qh
 ../csqcmodellib/cl_model.qh
 ../csqcmodellib/cl_player.qh
 projectile.qh
+player_skeleton.qh
 
 sortlist.qc
 miscfunctions.qc
-teamplay.qc
+../server/t_items.qc
 
 teamradar.qc
 hud_config.qc
@@ -53,6 +66,7 @@ hud.qc
 scoreboard.qc
 mapvoting.qc
 csqcmodel_hooks.qc
+../common/net_notice.qc
 
 rubble.qc
 hook.qc
@@ -71,6 +85,7 @@ tuba.qc
 target_music.qc
 
 vehicles/vehicles.qc
+../server/vehicles/bumblebee.qc
 shownames.qh
 shownames.qc
 
@@ -85,11 +100,16 @@ bgmscript.qc
 noise.qc
 
 ../common/util.qc
-../common/gamecommand.qc
+../common/notifications.qc
+../common/command/markup.qc
+../common/command/rpn.qc
+../common/command/generic.qc
 ../common/mapinfo.qc
 ../common/items.qc
 ../server/w_all.qc
 ../common/explosion_equation.qc
+../common/urllib.qc
+command/cl_cmd.qc
 
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
@@ -97,4 +117,7 @@ noise.qc
 ../warpzonelib/client.qc
 tturrets.qc
 
+player_skeleton.qc
+../common/animdecide.qc
+
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail