Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 21 Jan 2020 20:35:01 +0000 (06:35 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 21 Jan 2020 20:35:01 +0000 (06:35 +1000)
commitfe65404b4515e2f7db18a71c9953f318003b214e
treeb058cd2af97c91e06c7b234ba4662b8f4854a828
parent17d9558bff4fa8c1d7f558897b7830cb0cf4dca6
parent4cd50d8a56e2c78a9374f845fa18c605545020f5
Merge branch 'master' into Mario/monsters
qcsrc/common/mapobjects/func/breakable.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh