Merge branch 'master' into Mario/turrets
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:21:16 +0000 (13:21 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:21:16 +0000 (13:21 +1100)
commitac5366add2c2d44bff2e03fc916b991eb009a10a
tree3d0224827e05effa41872fdbc186045b91295a02
parentc3f6bc06517a43e4de33d2a9148cdb36dbfc2ab8
parent26f37b6d480a3a276af0ab52ac340dd110186704
Merge branch 'master' into Mario/turrets

Conflicts:
qcsrc/server/progs.src
qcsrc/server/tturrets/units/unit_plasma.qc
14 files changed:
qcsrc/client/Main.qc
qcsrc/client/progs.src
qcsrc/common/deathtypes.qh
qcsrc/common/notifications.qh
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/unit/plasma.qc
qcsrc/common/turrets/unit/plasma_dual.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/progs.src
qcsrc/server/t_teleporters.qc