]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Juhu/velocity_pads
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Fri, 2 Jun 2023 13:43:25 +0000 (15:43 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Fri, 2 Jun 2023 13:54:21 +0000 (15:54 +0200)
commitdb4b7060ae4873483005f94903029188eb60d649
treee61804fe8e777f71f2a38396fabf5e9f04141ecc
parent9659b84c56adaa77cc64a66d584cb3a71ca24f09
parent37420850358de2c3ca095265ece240ca3051a126
Merge branch 'master' into Juhu/velocity_pads

make trigger_push_velocity code compatible with the latest ExactTrigger changes
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/mapobjects/trigger/jumppads.qh
qcsrc/common/util.qc