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

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

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

author	TimePath <andrew.hardaker1995@gmail.com>
	Mon, 28 Sep 2015 02:09:12 +0000 (12:09 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Mon, 28 Sep 2015 02:09:12 +0000 (12:09 +1000)
commit	6b8b403dbd938914eeaa6a02f98d0e939950d29e
tree	2243a959422be6e77c3115ec0c8f18d328f6a538	tree \| snapshot
parent	ec9c61b50671bede8fb5fba2c6c217d7bb49aedc	commit \| diff
parent	7e8197a1381871d043f791f450f56b9b3f1fcea5	commit \| diff

Merge branch 'master' into TimePath/universal_weapons

# Conflicts:
# qcsrc/common/turrets/unit/plasma_dual.qc

37 files changed:

qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/plasma_dual.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	diff2 \|	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/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_hook.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_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/selection.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/spawning.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/plasma_dual.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	diff2 \|	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/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_hook.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_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/selection.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/spawning.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history