From: bones_was_here <bones_was_here@xonotic.au>
Date: Fri, 17 Feb 2023 07:34:28 +0000 (+0000)
Subject: Merge branch 'Juhu/q3_jumppads' into 'master'
X-Git-Tag: xonotic-v0.8.6~168
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=c0ee008a281d1d4b5f7580c065afb22fc30e19c9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Juhu/q3_jumppads' into 'master'

Jump pad trajectory origin and q3compat

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

c0ee008a281d1d4b5f7580c065afb22fc30e19c9