From: Mario <zacjardine@y7mail.com>
Date: Wed, 24 Dec 2014 04:28:57 +0000 (+0000)
Subject: Merge branch 'TimePath/features/jetpack_jump' into 'master'
X-Git-Tag: xonotic-v0.8.0~52
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e0fddda385e26f84951f699bd0292aef3e21188;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/features/jetpack_jump' into 'master'

Jetpack Jump

Changes the jetpack to be activated by jumping again in the air, this is much more natural.
Also allows the hook to be used at the same time.

See merge request !59
---

3e0fddda385e26f84951f699bd0292aef3e21188