]> 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: ad8173a 42a94e6)
Merge branch 'Mario/falldamage_vertical' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 30 Dec 2019 07:53:39 +0000 (07:53 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 30 Dec 2019 07:53:39 +0000 (07:53 +0000)
Merge branch Mario/falldamage_vertical (XS merge request)

Adds an option to make fall damage only apply to the vertical axis, potentially useful.

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

1  2 
qcsrc/server/sv_main.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/sv_main.qc
Simple merge