]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 48ff84c 5eaca37)
Merge branch 'martin-t/nades' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 28 Sep 2016 07:09:07 +0000 (07:09 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 28 Sep 2016 07:09:07 +0000 (07:09 +0000)
commitcfaaf960d6781c345dbbdc398444b065e6b13b7c
tree088ae56cb1b3b4eeac15eb26d4ebafe4d51fa99atree | snapshot
parent48ff84c8379f775aaa81f036860feb81cc472d22commit | diff
parent5eaca37a946c6f1f2324de1401772839ccf953c9commit | diff
Merge branch 'martin-t/nades' into 'master'

fix nades colliding with the player himself (unless g_nades_nade_small is 1)

I am not sure if this is a good enough fix but it seems to work. Previously, the nades were often thrown from the "backup" location because with the default offset they were partially inside the player.

See merge request !367