From: Mario <zacjardine@y7mail.com>
Date: Fri, 27 Mar 2015 08:15:05 +0000 (+0000)
Subject: Merge branch 'Mario/nade_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.1~97
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49e9b4a216bb11b70b988c5490156f2dba0aafd5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/nade_fixes' into 'master'

Merge branch Mario/nade_fixes (M merge request)

Fixes nades disappearing when touching clips, allows dropping the nade down only when player is both looking down and holding crouch, fixes ultra fast overkill superweapon re-spawn times, adds an option to change the nade throw offset (possibly useful for servers that wish to attempt to reproduce the old overkill's nade throw offsets).

See merge request !112
---

49e9b4a216bb11b70b988c5490156f2dba0aafd5