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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: ca9b32a 82ab36d)

author	Mario <mario@smbclan.net>
	Fri, 21 Oct 2016 01:27:13 +0000 (11:27 +1000)
committer	Mario <mario@smbclan.net>
	Fri, 21 Oct 2016 01:27:13 +0000 (11:27 +1000)
commit	cc37ae9ec08cca9f8b17cdbf91e71380d0d6f700
tree	7f4cdd5b1b7667ef7fb18a9443fe6a9ad899f864	tree \| snapshot
parent	ca9b32a13aaea249d3b5a90a10aaae170bf6aad5	commit \| diff
parent	82ab36d1b4c5e08c76c0822cc76fce6fa5ed2cf7	commit \| diff

Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/weapons/weapon/hagar.qc
# qcsrc/common/weapons/weapon/tuba.qc

16 files changed:

qcsrc/common/monsters/monster.qh	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/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/scripting.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history