Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 3 Jul 2015 06:29:25 +0000 (16:29 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 3 Jul 2015 06:29:25 +0000 (16:29 +1000)
# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/menu/menu.qc
# qcsrc/menu/progs.src
# qcsrc/server/g_world.qc

1  2 
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/menu/menu.qc
qcsrc/menu/progs.src
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc

@@@ -39,9 -39,7 +39,9 @@@
  #include "../common/stats.qh"
  #include "../common/teams.qh"
  
- #include "../common/weapons/weapons.qh"
 +#include "../common/items/all.qh"
 +
+ #include "../common/weapons/all.qh"
  
  #include "../csqcmodellib/cl_model.qh"
  #include "../csqcmodellib/interpolate.qh"
@@@ -55,11 -55,9 +55,11 @@@ weapons/projectile.qc // TOD
  ../common/urllib.qc
  ../common/util.qc
  
- ../common/monsters/monsters.qc
 +../common/items/all.qc
 +
+ ../common/monsters/all.qc
  
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../csqcmodellib/cl_model.qc
  ../csqcmodellib/cl_player.qc
@@@ -2,8 -2,7 +2,8 @@@
  #include "oo/classes.qc"
  #include "xonotic/util.qh"
  
- #include "../common/weapons/weapons.qh"
 +#include "../common/items/all.qh"
+ #include "../common/weapons/all.qh"
  #include "../common/mapinfo.qh"
  
  ///////////////////////////////////////////////
@@@ -21,10 -21,8 +21,10 @@@ xonotic/util.q
  ../common/urllib.qc
  ../common/util.qc
  
- ../common/monsters/monsters.qc
 +../common/items/all.qc
 +
+ ../common/monsters/all.qc
  
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../warpzonelib/mathlib.qc
@@@ -32,8 -32,7 +32,8 @@@
  #include "../common/stats.qh"
  #include "../common/teams.qh"
  #include "../common/util.qh"
- #include "../common/weapons/weapons.qh"
 +#include "../common/items/all.qh"
+ #include "../common/weapons/all.qh"
  
  const float LATENCY_THINKRATE = 10;
  .float latency_sum;
Simple merge
@@@ -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
  
Simple merge