Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 3449ae258c31b7b2bc2f77c6dd6cd3ea8c910be2..3e32ee235acaedc9c6f01a9fb1f48bfca78acd69 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -8,6 +8,7 @@ sys-post.qh
 Defs.qc
 ../dpdefs/keycodes.qc
 ../common/constants.qh
+../common/stats.qh
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
@@ -16,9 +17,12 @@ Defs.qc
 
 ../common/teams.qh
 ../common/util.qh
+../common/nades.qh
+../common/buffs.qh
 ../common/test.qh
 ../common/counting.qh
-../common/weapons/weapons.qh // TODO
+../common/items.qh
+../common/explosion_equation.qh
 ../common/mapinfo.qh
 ../common/command/markup.qh
 ../common/command/rpn.qh
@@ -28,6 +32,8 @@ Defs.qc
 ../common/animdecide.qh
 command/cl_cmd.qh
 
+../common/monsters/monsters.qh
+
 autocvars.qh
 
 ../common/notifications.qh // must be after autocvars
@@ -48,17 +54,16 @@ tturrets.qh
 ../server/tturrets/include/turrets_early.qh
 ../server/movelib.qc
 main.qh
-vehicles/vehicles.qh
+../common/vehicles/vehicles_include.qh
 ../common/csqcmodel_settings.qh
 ../csqcmodellib/common.qh
 ../csqcmodellib/cl_model.qh
 ../csqcmodellib/cl_player.qh
-weapons/projectile.qh // TODO
+projectile.qh
 player_skeleton.qh
 
 sortlist.qc
 miscfunctions.qc
-../server/t_items.qh
 ../server/t_items.qc
 
 teamradar.qc
@@ -73,7 +78,7 @@ rubble.qc
 hook.qc
 particles.qc
 laser.qc
-weapons/projectile.qc // TODO
+projectile.qc
 gibs.qc
 damage.qc
 casings.qc
@@ -85,8 +90,7 @@ modeleffects.qc
 tuba.qc
 target_music.qc
 
-vehicles/vehicles.qc
-../server/vehicles/bumblebee.qc
+../common/vehicles/vehicles_include.qc
 shownames.qh
 shownames.qc
 
@@ -107,10 +111,17 @@ noise.qc
 ../common/command/rpn.qc
 ../common/command/generic.qc
 ../common/mapinfo.qc
-../common/weapons/weapons.qc // TODO
+../common/items.qc
+../server/w_all.qc
+../common/explosion_equation.qc
 ../common/urllib.qc
 command/cl_cmd.qc
 
+../common/monsters/monsters.qc
+
+../common/nades.qc
+../common/buffs.qc
+
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc