Merge branch 'master' into martin-t/maxshotdist 395/head
authorMario <mario@smbclan.net>
Sat, 31 Dec 2016 01:28:57 +0000 (11:28 +1000)
committerMario <mario@smbclan.net>
Sat, 31 Dec 2016 01:28:57 +0000 (11:28 +1000)
1  2 
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/vehicles/vehicle/raptor.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/server/cheats.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/teamplay.qc

Simple merge
Simple merge
Simple merge
@@@ -1,8 -1,7 +1,9 @@@
  #include "gamemode_assault.qh"
  
 +#include <lib/float.qh>
 +
  .entity sprite;
+ #define AS_ROUND_DELAY 5
  
  // random functions
  void assault_objective_use(entity this, entity actor, entity trigger)
Simple merge