Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 24 May 2020 16:46:18 +0000 (02:46 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 24 May 2020 16:46:18 +0000 (02:46 +1000)
commitcf2c574ea97887fc98f0f8ff5efd11ece1f48b3b
tree367c834988050f075319d4b8dc0a9420550db6ff
parentaa5a713b068b4e4b4ecd2ca69bd375e20c7b4237
parentcafa715c95c3f8fefd84f80e11a57c20b1108eb7
Merge branch 'master' into Mario/monsters
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/notifications/all.inc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc