]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Wed, 22 Nov 2017 10:32:38 +0000 (20:32 +1000)
committerMario <mario@smbclan.net>
Wed, 22 Nov 2017 10:32:38 +0000 (20:32 +1000)
commit8319f82185c2c3a9609181abf54bbeea63071e8d
treebc186bd3390c9ec5b6602b0c63db754a3c343165
parentbc38004537ee56b108f2d4d37d59d3bb2408cb4c
parent0da0a4a0902511a6bfb5f45f88a83632b135a85c
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/shambler.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/monsters/monster/golem.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/common/triggers/func/breakable.qc
qcsrc/common/weapons/projectiles.qh
qcsrc/menu/xonotic/util.qc