From: TimePath <andrew.hardaker1995@gmail.com>
Date: Fri, 3 Jul 2015 06:29:25 +0000 (+1000)
Subject: Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys
X-Git-Tag: xonotic-v0.8.1~53^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f239100c8b77275d69972f91ac4e7ff913f3d7c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

# Conflicts:
#	qcsrc/client/main.qc
#	qcsrc/client/progs.src
#	qcsrc/menu/menu.qc
#	qcsrc/menu/progs.src
#	qcsrc/server/g_world.qc
---

2f239100c8b77275d69972f91ac4e7ff913f3d7c
diff --cc qcsrc/client/main.qc
index 0cedf8fd7,298bcdbef..7648b1297
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -39,9 -39,7 +39,9 @@@
  #include "../common/stats.qh"
  #include "../common/teams.qh"
  
 +#include "../common/items/all.qh"
 +
- #include "../common/weapons/weapons.qh"
+ #include "../common/weapons/all.qh"
  
  #include "../csqcmodellib/cl_model.qh"
  #include "../csqcmodellib/interpolate.qh"
diff --cc qcsrc/client/progs.src
index 5fbff743d,843ae12a4..8ba12b9e7
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -55,11 -55,9 +55,11 @@@ weapons/projectile.qc // TOD
  ../common/urllib.qc
  ../common/util.qc
  
 +../common/items/all.qc
 +
- ../common/monsters/monsters.qc
+ ../common/monsters/all.qc
  
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../csqcmodellib/cl_model.qc
  ../csqcmodellib/cl_player.qc
diff --cc qcsrc/menu/menu.qc
index 50183b977,70f4249d0..d8a3ede2e
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@@ -2,8 -2,7 +2,8 @@@
  #include "oo/classes.qc"
  #include "xonotic/util.qh"
  
 +#include "../common/items/all.qh"
- #include "../common/weapons/weapons.qh"
+ #include "../common/weapons/all.qh"
  #include "../common/mapinfo.qh"
  
  ///////////////////////////////////////////////
diff --cc qcsrc/menu/progs.src
index 124ac9db7,636c862b7..2315616d1
--- a/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@@ -21,10 -21,8 +21,10 @@@ xonotic/util.q
  ../common/urllib.qc
  ../common/util.qc
  
 +../common/items/all.qc
 +
- ../common/monsters/monsters.qc
+ ../common/monsters/all.qc
  
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../warpzonelib/mathlib.qc
diff --cc qcsrc/server/g_world.qc
index 63f2db883,3806d5eb2..a31670a08
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -32,8 -32,7 +32,8 @@@
  #include "../common/stats.qh"
  #include "../common/teams.qh"
  #include "../common/util.qh"
 +#include "../common/items/all.qh"
- #include "../common/weapons/weapons.qh"
+ #include "../common/weapons/all.qh"
  
  const float LATENCY_THINKRATE = 10;
  .float latency_sum;
diff --cc qcsrc/server/progs.src
index 0455f6b6b,a812de46a..75301d592
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -107,11 -107,8 +107,11 @@@ weapons/weaponsystem.q
  ../common/test.qc
  ../common/urllib.qc
  ../common/util.qc
 +
 +../common/items/all.qc
 +
  ../common/weapons/config.qc
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../csqcmodellib/sv_model.qc