]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7892e4a 31f7259)
Merge branch 'Mario/droptofloor_outofsolid' into 'master'
authorbones_was_here <bones_was_here@xonotic.au>
Fri, 2 Dec 2022 17:27:34 +0000 (17:27 +0000)
committerbones_was_here <bones_was_here@xonotic.au>
Fri, 2 Dec 2022 17:27:34 +0000 (17:27 +0000)
Make sv_gameplayfix_droptofloorstartsolid_nudgetocorrect functional again

Closes #2774

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

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

diff --cc qcsrc/server/world.qc
Simple merge
diff --cc qcsrc/server/world.qh
Simple merge