]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5379cc3 499ed84)
Merge remote-tracking branch 'origin/Mario/ka_fixes'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:11:45 +0000 (11:11 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:11:45 +0000 (11:11 +0200)
* origin/Mario/ka_fixes:
  Teleport the ball to a spawnpoint if random location failed (fixes a crash), show a different centerprint notification to the player who picked up the ball


Trivial merge