Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 29 Jun 2020 12:39:56 +0000 (22:39 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 29 Jun 2020 12:39:56 +0000 (22:39 +1000)
commit83f281637f0f29ef570789200116efc8149fecbd
treee66e84a780a653902e50da36855bf5ccf09ca686
parentcf2c574ea97887fc98f0f8ff5efd11ece1f48b3b
parentb7f01d62a12d363e2ad28090b22c208694826ec1
Merge branch 'master' into Mario/monsters
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/mapinfo.qh
qcsrc/common/models/all.inc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/command/common.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh