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

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

author	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 3 Oct 2015 08:29:19 +0000 (18:29 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 3 Oct 2015 08:29:38 +0000 (18:29 +1000)
commit	a8cc9eb71b0d0e44e9a968a9cf5554f6226cc838
tree	e1ceed8fc33c1a37fb03c94d82464527e6d3b737	tree \| snapshot
parent	a77c14223df1103793956a4f7522bd4b6f60dd40	commit \| diff
parent	1af8ea71282d19f66c96622815c68943eaa36aba	commit \| diff

Merge branch 'master' into TimePath/unified_weapons

# Conflicts:
# qcsrc/common/turrets/turret/ewheel.qc
# qcsrc/common/turrets/turret/hk_weapon.qc
# qcsrc/common/turrets/turret/walker.qc
# qcsrc/common/turrets/unit/flac.qc
# qcsrc/common/turrets/unit/fusionreactor.qc
# qcsrc/common/turrets/unit/hellion.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/vehicles/vehicle/bumblebee.qc
# qcsrc/common/weapons/weapon/hook.qc
# qcsrc/common/weapons/weapon/vortex.qc
# qcsrc/server/mutators/mutator_overkill.qc

60 files changed:

qcsrc/client/progs.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/wyvern.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/zombie.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/itemstime.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/turret/ewheel.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/flac.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/fusionreactor.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/hellion.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/hk.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/machinegun.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/mlrs.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/phaser.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/plasma.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/plasma_dual.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/tesla.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/walker.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/bumblebee.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/racer.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/raptor.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/spiderbot.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	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_invasion.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/progs.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/wyvern.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/zombie.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/itemstime.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/turret/ewheel.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/flac.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/fusionreactor.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/hellion.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/hk.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/machinegun.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/mlrs.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/phaser.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/plasma.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/plasma_dual.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/tesla.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turret/walker.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/bumblebee.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/racer.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/raptor.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicle/spiderbot.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	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_invasion.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history