Merge branch 'master' into Mario/minigames_merge

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index e5251bef3fe3ddab780b83f5bffc4d0c5e61aa50..f10b721ae5ec081b08e2972d808f3acd32533c57 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -14,6 +14,7 @@ cheats.qc
 cl_client.qc
 cl_impulse.qc
 cl_player.qc
+controlpoint.qc
 csqceffects.qc
 ent_cs.qc
 g_casings.qc
@@ -22,9 +23,9 @@ g_hook.qc
 // g_lights.qc // TODO: was never used
 g_models.qc
 g_subs.qc
-g_tetris.qc
 g_violence.qc
 g_world.qc
+generator.qc
 ipban.qc
 item_key.qc
 mapvoting.qc
@@ -55,7 +56,6 @@ bot/waypoints.qc
 
 bot/havocbot/havocbot.qc
 bot/havocbot/role_keyhunt.qc
-bot/havocbot/role_onslaught.qc
 bot/havocbot/roles.qc
 
 command/all.qc
@@ -89,6 +89,8 @@ weapons/weaponsystem.qc
 ../common/mapinfo.qc
 ../common/monsters/spawn.qc
 ../common/monsters/sv_monsters.qc
+../common/minigames/minigames.qc
+../common/minigames/sv_minigames.qc
 ../common/movetypes/include.qc
 ../common/nades.qc
 ../common/net_notice.qc
@@ -108,6 +110,12 @@ weapons/weaponsystem.qc
 ../common/vehicles/all.qc
 ../common/weapons/all.qc // TODO
 
+../common/turrets/sv_turrets.qc
+../common/turrets/config.qc
+../common/turrets/util.qc
+../common/turrets/turrets.qc
+../common/turrets/checkpoint.qc
+../common/turrets/targettrigger.qc
 ../common/weapons/config.qc
 
 ../csqcmodellib/sv_model.qc