]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c0b22c 00200db)
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 patch | diff1 | diff2 | blob | history
qcsrc/ecs/systems/physics.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/physics/player.qc
Simple merge
diff --cc qcsrc/ecs/systems/physics.qc
Simple merge