Merge branch 'master' into Mario/turrets
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 08:56:02 +0000 (18:56 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 08:56:47 +0000 (18:56 +1000)
commit25e5c49d0236dfc40abc562ca0cd24a78f8c8deb
tree5cdb01e035a0009879669b84783e95a7ae67d0fd
parentf8619f6d361c9acca9609462bd8a617ee12fde9e
parent6bef2387c607b0ce975d13a94cb55d3e746b626d
Merge branch 'master' into Mario/turrets

# Conflicts:
# qcsrc/client/progs.src
# qcsrc/common/monsters/sv_monsters.qc
# qcsrc/common/triggers/teleporters.qc
# qcsrc/common/vehicles/sv_vehicles.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/g_damage.qh
# qcsrc/server/mutators/mutators_include.qc
13 files changed:
qcsrc/client/damage.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/triggers/teleporters.qc
qcsrc/common/vehicles/sv_vehicles.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_damage.qh
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/progs.src