Merge branch 'master' into TimePath/unified_weapons
authorTimePath <andrew.hardaker1995@gmail.com>
Tue, 6 Oct 2015 01:41:18 +0000 (12:41 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Tue, 6 Oct 2015 01:41:24 +0000 (12:41 +1100)
commit7bd8f8562a392fda3ac881b1fbe2a35a5ef0f5c8
tree9166f29080078c3c5576bde44be6bd5627e654e7
parent65f750b860e32f02cdc60a12e6d90d8782ba2bc9
parent3e4fba6a8948d035faf1dd5afcb672fbf5498078
Merge branch 'master' into TimePath/unified_weapons

# Conflicts:
# qcsrc/common/nades.qc
# qcsrc/common/vehicles/sv_vehicles.qc
# qcsrc/common/vehicles/vehicle/bumblebee.qc
# qcsrc/common/vehicles/vehicle/spiderbot.qc
13 files changed:
qcsrc/client/main.qc
qcsrc/client/progs.inc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.inc