de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mapobjects/target/spawn.qc

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mapobjects/target/spawn.qc

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 1e176ef dfebc2f)

author	Mario <mario.mario@y7mail.com>
	Sun, 8 Nov 2020 11:16:53 +0000 (21:16 +1000)
committer	Mario <mario.mario@y7mail.com>
	Sun, 8 Nov 2020 11:16:53 +0000 (21:16 +1000)
commit	80e96d3476de18ec2d27c905eb789bd39b2f52f9
tree	d4571ef59c186cb58032782fad3825040aabaf16	tree \| snapshot
parent	1e176ef531627d4ea57dcb8b3064e996991f4b76	commit \| diff
parent	dfebc2fb9d2738748fb0032b41c2acda657757a2	commit \| diff

Merge branch 'master' into Mario/monsters

17 files changed:

qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapobjects/func/breakable.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/models/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster.qh	diff1 \|	diff2 \|	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/wyvern.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/sv_turrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/sv_turrets.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	\|	diff2 \|	blob \| history
qcsrc/server/world.qh	\|	diff2 \|	blob \| history