git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/minigames/minigame/c4.qc

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/minigames/minigame/c4.qc

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

summary | shortlog | log | commit | commitdiff | tree
(merge: f53cfd3 dad0572)

author	Mario <mario.mario@y7mail.com>
	Fri, 29 Apr 2022 12:43:46 +0000 (22:43 +1000)
committer	Mario <mario.mario@y7mail.com>
	Fri, 29 Apr 2022 12:43:46 +0000 (22:43 +1000)
commit	323105d51f8eb6dea47c063965be5e34ad57f987
tree	4f419c9de36344c82555fc4d65beb391280ee4ef	tree \| snapshot
parent	f53cfd3a6161ba8b7a62bd953d18e689f051b337	commit \| diff
parent	dad0572b6112ed622fd0c19850e9036867f8833b	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/gamemodes/gamemode/invasion/sv_invasion.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapobjects/func/breakable.qc	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/spider.qh	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/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/sv_turrets.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	diff1 \|	diff2 \|	blob \| history