From: bones_was_here <bones_was_here@xonotic.au>
Date: Fri, 17 May 2024 09:03:34 +0000 (+0000)
Subject: Merge branch 'bones_was_here/q1bsp_hitbox' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d845ba181ccaf1f5ea232a0aefe772d9215e0380;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/q1bsp_hitbox' into 'master'

Q1BSP: use compatible collision detection

Closes #2895

See merge request xonotic/xonotic-data.pk3dir!1224
---

d845ba181ccaf1f5ea232a0aefe772d9215e0380