From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 4 Jun 2014 09:32:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/Mario/hook_refire'
X-Git-Tag: xonotic-v0.8.0~190
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=b8bf0a16d1c441ae346e4cefcbe80ae4f2937f85;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/hook_refire'

* origin/Mario/hook_refire:
  Add a new cvar for offhand hook refire
  Obey refire delay in offhand hook mode
  Also add delay to Nexuiz balance
  Add a 0.2 second delay on grappling hook to prevent spam
---

b8bf0a16d1c441ae346e4cefcbe80ae4f2937f85