]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7326628 0986191)
Merge branch 'TimePath/features/jetpack_jump' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 24 Dec 2014 04:28:57 +0000 (04:28 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 24 Dec 2014 04:28:57 +0000 (04:28 +0000)
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


Trivial merge