]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 18 Nov 2019 10:12:08 +0000 (20:12 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 18 Nov 2019 10:12:08 +0000 (20:12 +1000)
commit17d9558bff4fa8c1d7f558897b7830cb0cf4dca6
treec18cdf1d21806de5318c6cfe74e1ab2aa2dee0bd
parent2e60d4af0278db5d39618bf8fee353c220d90486
parent00d7b1f218f33b3ea604681e700ac2aadc12a29e
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/shambler.qc
# qcsrc/common/monsters/monster/wyvern.qc
# qcsrc/common/monsters/sv_monsters.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/mapinfo.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc