]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/Mario/round_jump_fix'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:09:24 +0000 (11:09 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:09:24 +0000 (11:09 +0200)
commitd159d68eea046ca027b7260634c63ba40f943633
treea914d5349e51ff64b1ec3a1fdedf8507908de1c0
parentad566dd204defe7c6599372aca3924433a8c8133
parentc65ee59d29b2193d913dccd320029aa110a6620a
Merge remote-tracking branch 'origin/Mario/round_jump_fix'

* origin/Mario/round_jump_fix:
  Disable jumping while player is blocked, they can't move so jumping is weird and unpredicted