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)
Merge branch Mario/waterjump_fix (S merge request)

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

1  2 
qcsrc/common/physics/player.qc
qcsrc/ecs/systems/physics.qc

Simple merge
Simple merge