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)
commit80afa8735de5af3e81d880e9980c7d9fbc3e481c
tree988eddbd67fca000a5e3c2efc1f7088442b9c969
parent5fd095851bcaf4dfc194ed95cdb6f28faf9acb54
parentfca1fc158c44eff425d73fa279900144249aca16
Merge branch 'master' into martin-t/maxshotdist
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