From: Mario <zacjardine@y7mail.com>
Date: Wed, 28 Sep 2016 07:09:07 +0000 (+0000)
Subject: Merge branch 'martin-t/nades' into 'master'
X-Git-Tag: xonotic-v0.8.2~565
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cfaaf960d6781c345dbbdc398444b065e6b13b7c;p=xonotic%2Fxonotic-data.pk3dir.git

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
---

cfaaf960d6781c345dbbdc398444b065e6b13b7c