git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 23 Aug 2015 08:07:27 +0000 (18:07 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 23 Aug 2015 08:08:06 +0000 (18:08 +1000)
commit	221325d0a55851348e3397354225f04cd472d42f
tree	5a616babcf313be0767aaa11abb22f0fa11461ec	tree \| snapshot
parent	82dbcadfd0556053b74638f2e3ae2e57103ddf26	commit \| diff
parent	1217fce596f1b9769ffb6f479e3abbd4f77af5ef	commit \| diff

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

qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/common/command/generic.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/teleporters.qc	\|	diff2 \|	blob \| history
qcsrc/common/turrets/cl_turrets.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/sv_turrets.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/sv_turrets.qh	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turrets.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/ewheel.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/flac.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/fusionreactor.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/hellion.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/hk.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/machinegun.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/mlrs.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/phaser.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/plasma.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/plasma_dual.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/tesla.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/walker.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/util.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qh	\|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_assault.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history