]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8580e70 4f45c52)
Merge branch 'bones_was_here/q1bsp_hitbox' into 'master'
authorbones_was_here <bones_was_here@xonotic.au>
Fri, 17 May 2024 09:03:34 +0000 (09:03 +0000)
committerbones_was_here <bones_was_here@xonotic.au>
Fri, 17 May 2024 09:03:34 +0000 (09:03 +0000)
Q1BSP: use compatible collision detection

Closes #2895

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

1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
xonotic-common.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc xonotic-common.cfg
Simple merge