Merge branch 'terencehill/hud_no_joypad_keys' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / _all.inc

diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc
index 78d2373e2d59e508b7a0d7a175f2a3d976ff027e..b16c24fb47086179068f433c7b93a057f28836c0 100644 (file)
--- a/qcsrc/common/_all.inc
+++ b/qcsrc/common/_all.inc
@@ -1,3 +1,5 @@
+float autocvar_net_connecttimeout = 30;
+
 #ifndef MENUQC
 #include "anim.qc"
 #include "animdecide.qc"
@@ -37,11 +39,11 @@
 #include "t_items.qc"
 #endif
 
-#include "items/all.qc"
+#include "items/_mod.inc"
     #include "weapons/all.qc"
         #include "monsters/all.qc"
         #include "turrets/all.qc"
         #include "vehicles/all.qc"
 
-#include "mutators/all.qc"
-    #include "gamemodes/all.qc"
+#include "mutators/_mod.inc"
+    #include "gamemodes/_mod.inc"