Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 9cc8c9954de7f377264353159510ff2ffa9bc99d..1120eda510e54fa2014f20125fb86c80b7fdd16b 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -11,6 +11,7 @@ sys-post.qh
 ../warpzonelib/common.qh
 ../warpzonelib/util_server.qh
 ../warpzonelib/server.qh
+
 ../common/constants.qh
 ../common/stats.qh
 ../common/teams.qh
@@ -19,6 +20,8 @@ sys-post.qh
 ../common/buffs.qh
 ../common/test.qh
 ../common/counting.qh
+../common/items.qh
+../common/explosion_equation.qh
 ../common/urllib.qh
 ../common/command/markup.qh
 ../common/command/rpn.qh
@@ -30,21 +33,6 @@ sys-post.qh
 ../common/monsters/sv_monsters.qh
 ../common/monsters/spawn.qh
 
-../common/weapons/config.qh
-../common/weapons/weapons.qh // TODO
-weapons/accuracy.qh
-weapons/common.qh
-weapons/csqcprojectile.qh // TODO
-weapons/hitplot.qh
-weapons/selection.qh
-weapons/spawning.qh
-weapons/throwing.qh
-weapons/tracing.qh
-weapons/weaponstats.qh
-weapons/weaponsystem.qh
-
-t_items.qh
-
 autocvars.qh
 constants.qh
 defs.qh                // Should rename this, it has fields and globals
@@ -52,10 +40,14 @@ defs.qh             // Should rename this, it has fields and globals
 ../common/notifications.qh // must be after autocvars
 ../common/deathtypes.qh // must be after notifications
 
+../common/turrets/config.qh
+../common/turrets/turrets.qh
+../common/turrets/sv_turrets.qh
+../common/turrets/util.qc
+
 mutators/mutators_include.qh
 
-//// tZork Turrets ////
-tturrets/include/turrets_early.qh
+//// tZork Vehicles ////
 vehicles/vehicles_def.qh
 
 campaign.qh
@@ -70,7 +62,8 @@ command/getreplies.qh
 command/cmd.qh
 command/sv_cmd.qh
 
-
+accuracy.qh
+csqcprojectile.qh
 ../common/csqcmodel_settings.qh
 ../csqcmodellib/common.qh
 ../csqcmodellib/sv_model.qh
@@ -82,7 +75,9 @@ playerstats.qh
 
 portals.qh
 
-g_hook.qh // TODO
+g_hook.qh
+w_electro.qh
+w_laser.qh
 
 scores.qh
 
@@ -149,20 +144,13 @@ g_models.qc
 item_key.qc
 secret.qc
 
-weapons/accuracy.qc
-weapons/common.qc
-weapons/csqcprojectile.qc // TODO
-weapons/hitplot.qc
-weapons/selection.qc
-weapons/spawning.qc
-weapons/throwing.qc
-weapons/tracing.qc
-weapons/weaponstats.qc
-weapons/weaponsystem.qc
-../common/weapons/config.qc
-../common/weapons/weapons.qc // TODO
+cl_weaponsystem.qc
+w_common.qc
+
+w_all.qc
 
 t_items.qc
+cl_weapons.qc
 cl_impulse.qc
 
 ent_cs.qc
@@ -211,8 +199,7 @@ t_quake.qc
 race.qc
 
 
-//// tZork Turrets ////
-tturrets/include/turrets.qh
+//// tZork Vehicles ////
 vehicles/vehicles.qh
 
 scores.qc
@@ -225,10 +212,15 @@ target_spawn.qc
 func_breakable.qc
 target_music.qc
 
+../common/items.qc
+
 ../common/nades.qc
 ../common/buffs.qc
 
+
+accuracy.qc
 ../csqcmodellib/sv_model.qc
+csqcprojectile.qc
 
 playerdemo.qc
 
@@ -238,6 +230,14 @@ playerstats.qc
 
 round_handler.qc
 
+../common/explosion_equation.qc
+
+../common/turrets/sv_turrets.qc
+../common/turrets/config.qc
+../common/turrets/turrets.qc
+../common/turrets/checkpoint.qc
+../common/turrets/targettrigger.qc
+
 ../common/monsters/sv_monsters.qc
 ../common/monsters/monsters.qc