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

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/steerlib.qc

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

author	Mario <mario@smbclan.net>
	Wed, 5 Apr 2017 00:46:16 +0000 (10:46 +1000)
committer	Mario <mario@smbclan.net>
	Wed, 5 Apr 2017 00:46:16 +0000 (10:46 +1000)
commit	4852492fd0c38c70a2e87032969f226d168609de
tree	b91339a0aa28d6909a19d1b1cde559b79656af71	tree \| snapshot
parent	7fe02b995072e98d5d1da28b5ab362cf0c6440c8	commit \| diff
parent	b6b68fad0ba8fb6901de0fcb14774b709696d8bc	commit \| diff

Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/shambler.qc
# qcsrc/common/notifications/all.inc

75 files changed:

models/monsters/dragon.dpm	\|	\|	blob
models/monsters/dragon.dpm.framegroups	\|	\|	blob
models/monsters/golem.dpm	\|	\|	blob
models/monsters/golem.dpm.framegroups	\|	\|	blob
models/monsters/mage.dpm	blob1 \|	blob2 \|	history
models/monsters/mage.dpm.framegroups	blob1 \|	blob2 \|	history
models/monsters/nanomage.dpm	\|	\|	blob
models/monsters/nanomage.dpm.framegroups	\|	\|	blob
models/monsters/shambler.mdl	blob1 \|	blob2 \|	history
models/monsters/shambler.mdl.framegroups	blob1 \|	blob2 \|	history
models/monsters/shambler.mdl_0.sounds	blob1 \|	blob2 \|	history
models/monsters/spider.dpm	diff1 \|	diff2 \|	blob \| history
models/monsters/spider.dpm.framegroups	diff1 \|	diff2 \|	blob \| history
models/monsters/troll.dpm	\|	\|	blob
models/monsters/troll.dpm.framegroups	\|	\|	blob
models/monsters/troll.dpm_0.sounds	\|	\|	blob
models/monsters/wizard.mdl	blob1 \|	blob2 \|	history
models/monsters/wizard.mdl.framegroups	blob1 \|	blob2 \|	history
qcsrc/client/weapons/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/golem.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/troll.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/wyvern.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
scripts/golem.shader	\|	\|	blob
scripts/nanomage.shader	\|	\|	blob
scripts/spider.shader	\|	\|	blob
sound/monsters/troll/death1.wav	\|	\|	blob
sound/monsters/troll/death2.wav	\|	\|	blob
sound/monsters/troll/death3.wav	\|	\|	blob
sound/monsters/troll/idle1.wav	\|	\|	blob
sound/monsters/troll/idle2.wav	\|	\|	blob
sound/monsters/troll/melee.wav	\|	\|	blob
sound/monsters/troll/pain1.wav	\|	\|	blob
sound/monsters/troll/pain2.wav	\|	\|	blob
sound/monsters/troll/sight.wav	\|	\|	blob
textures/forest-monster-skin1.jpg	\|	\|	blob
textures/forest-monster-skin1_norm.jpg	\|	\|	blob
textures/forest-monster-skin1_pants.jpg	\|	\|	blob
textures/forest-monster-skin1_spec.jpg	\|	\|	blob
textures/glow_reflect.tga	\|	\|	blob
textures/golem.tga	\|	\|	blob
textures/golem_gloss.tga	\|	\|	blob
textures/golem_glow.tga	\|	\|	blob
textures/golem_norm.tga	\|	\|	blob
textures/golem_reflect.tga	\|	\|	blob
textures/golem_shirt.tga	\|	\|	blob
textures/mage.tga	blob1 \|	blob2 \|	history
textures/mage_glow.tga	blob1 \|	blob2 \|	history
textures/mage_pants.tga	blob1 \|	blob2 \|	history
textures/monsters/Dragon.tga	\|	\|	blob
textures/monsters/Dragon_Norm.tga	\|	\|	blob
textures/monsters/Dragon_Shirt.tga	\|	\|	blob
textures/monsters/Dragon_Spec.tga	\|	\|	blob
textures/nanomage.tga	\|	\|	blob
textures/nanomage_gloss.tga	\|	\|	blob
textures/nanomage_glow.tga	\|	\|	blob
textures/nanomage_norm.tga	\|	\|	blob
textures/nanomage_reflect.tga	\|	\|	blob
textures/nanomage_shirt.tga	\|	\|	blob
textures/spider.tga	\|	\|	blob
textures/spider_gloss.tga	\|	\|	blob
textures/spider_glow.tga	\|	\|	blob
textures/spider_norm.tga	\|	\|	blob
textures/spider_reflect.tga	\|	\|	blob
textures/spider_shirt.tga	\|	\|	blob
textures/spidertex.tga	blob1 \|	blob2 \|	history
textures/spidertex_glow.tga	blob1 \|	blob2 \|	history
textures/spidertex_pants.tga	blob1 \|	blob2 \|	history
textures/tree.tga	\|	\|	blob
textures/tree_norm.tga	\|	\|	blob
textures/tree_spec.tga	\|	\|	blob

RSS Atom