Merge branch 'master' into Mario/turrets
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 08:07:27 +0000 (18:07 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 08:08:06 +0000 (18:08 +1000)
commit221325d0a55851348e3397354225f04cd472d42f
tree5a616babcf313be0767aaa11abb22f0fa11461ec
parent82dbcadfd0556053b74638f2e3ae2e57103ddf26
parent1217fce596f1b9769ffb6f479e3abbd4f77af5ef
Merge branch 'master' into Mario/turrets

# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/client/tturrets.qc
# qcsrc/client/tturrets.qh
# qcsrc/common/command/generic.qc
# qcsrc/common/monsters/sv_monsters.qc
# qcsrc/common/nades.qc
# qcsrc/common/triggers/teleporters.qc
# qcsrc/server/autocvars.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/g_damage.qh
# qcsrc/server/g_world.qc
# qcsrc/server/miscfunctions.qc
# qcsrc/server/mutators/mutators_include.qc
# qcsrc/server/progs.src
# qcsrc/server/tturrets/include/turrets_early.qh
# qcsrc/server/tturrets/system/system_damage.qc
# qcsrc/server/tturrets/system/system_main.qc
# qcsrc/server/tturrets/system/system_misc.qc
# qcsrc/server/tturrets/units/unit_ewheel.qc
# qcsrc/server/tturrets/units/unit_flac.qc
# qcsrc/server/tturrets/units/unit_machinegun.qc
# qcsrc/server/tturrets/units/unit_phaser.qc
# qcsrc/server/tturrets/units/unit_plasma.qc
# qcsrc/server/tturrets/units/unit_tessla.qc
# qcsrc/server/tturrets/units/unit_walker.qc
# qcsrc/server/vehicles/bumblebee.qc
# qcsrc/server/vehicles/racer.qc
# qcsrc/server/vehicles/vehicles.qc
# qcsrc/server/vehicles/vehicles_def.qh
37 files changed:
qcsrc/client/damage.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/common/command/generic.qc
qcsrc/common/deathtypes.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/nades.qc
qcsrc/common/notifications.qh
qcsrc/common/triggers/teleporters.qc
qcsrc/common/turrets/cl_turrets.qc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/sv_turrets.qh
qcsrc/common/turrets/turrets.qc
qcsrc/common/turrets/unit/ewheel.qc
qcsrc/common/turrets/unit/flac.qc
qcsrc/common/turrets/unit/fusionreactor.qc
qcsrc/common/turrets/unit/hellion.qc
qcsrc/common/turrets/unit/hk.qc
qcsrc/common/turrets/unit/machinegun.qc
qcsrc/common/turrets/unit/mlrs.qc
qcsrc/common/turrets/unit/phaser.qc
qcsrc/common/turrets/unit/plasma.qc
qcsrc/common/turrets/unit/plasma_dual.qc
qcsrc/common/turrets/unit/tesla.qc
qcsrc/common/turrets/unit/walker.qc
qcsrc/common/turrets/util.qc
qcsrc/common/vehicles/sv_vehicles.qh
qcsrc/server/autocvars.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_damage.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/progs.src