Merge branch 'Mario/waterjump_fix' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 23 May 2020 21:31:06 +0000 (21:31 +0000)
committerterencehill <piuntn@gmail.com>
Sat, 23 May 2020 21:31:06 +0000 (21:31 +0000)
commitb7873b3470e961ee95d5823de13a87a63e7e0f3b
treec7ef06fef758abf0fac77699bac58f287a9f8308
parent9c0b22c63c7bcc25fb183db754dd3ddd836ecde6
parent00200db1e3369eff8628b32b62d24cff0ec717cd
Merge branch 'Mario/waterjump_fix' into 'master'

Merge branch Mario/waterjump_fix (S merge request)

See merge request xonotic/xonotic-data.pk3dir!809
qcsrc/common/physics/player.qc
qcsrc/ecs/systems/physics.qc