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

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index a33570a2f9c3291b7402ea61a7d9eb6a39914e9a..72f2e0b74626253e25acb2e4ff989c91f8431eac 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -14,19 +14,24 @@ Defs.qc
 ../warpzonelib/common.qh
 ../warpzonelib/client.qh
 
+../common/teams.qh
 ../common/util.qh
 ../common/items.qh
+../common/deathtypes.qh
+../common/notifications.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
 command/cl_cmd.qh
 
 autocvars.qh
 
+damage.qh
+
 ../csqcmodellib/interpolate.qh
 teamradar.qh
 hud.qh
@@ -36,7 +41,6 @@ movetypes.qh
 prandom.qh
 bgmscript.qh
 noise.qh
-teamplay.qh
 tturrets.qh
 ../server/tturrets/include/turrets_early.qh
 ../server/movelib.qc
@@ -50,7 +54,7 @@ projectile.qh
 
 sortlist.qc
 miscfunctions.qc
-teamplay.qc
+../server/t_items.qc
 
 teamradar.qc
 hud_config.qc
@@ -58,6 +62,7 @@ hud.qc
 scoreboard.qc
 mapvoting.qc
 csqcmodel_hooks.qc
+../common/net_notice.qc
 
 rubble.qc
 hook.qc
@@ -76,6 +81,7 @@ tuba.qc
 target_music.qc
 
 vehicles/vehicles.qc
+../server/vehicles/bumblebee.qc
 shownames.qh
 shownames.qc
 
@@ -90,6 +96,7 @@ bgmscript.qc
 noise.qc
 
 ../common/util.qc
+../common/notifications.qc
 ../common/command/markup.qc
 ../common/command/rpn.qc
 ../common/command/generic.qc
@@ -97,7 +104,7 @@ noise.qc
 ../common/items.qc
 ../server/w_all.qc
 ../common/explosion_equation.qc
-
+../common/urllib.qc
 command/cl_cmd.qc
 
 ../warpzonelib/anglestransform.qc