]> de.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: ad566dd c65ee59)
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)
* origin/Mario/round_jump_fix:
  Disable jumping while player is blocked, they can't move so jumping is weird and unpredicted


Trivial merge