]> 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: 428da72 64c4ea5)
Merge branch 'terencehill/noclip_death_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 17:18:17 +0000 (17:18 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 17:18:17 +0000 (17:18 +0000)
Noclip death fix

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

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

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