]> 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: f1d984d cb47301)
Merge remote-tracking branch 'origin/Mario/scoreboard_fixes', fixes #1974.
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:13:06 +0000 (11:13 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:13:06 +0000 (11:13 +0200)
* origin/Mario/scoreboard_fixes:
  Hide accuracy while spectating or playing nexball, show current gametype in the "playing on" scoreboard info string, hide respawn countdown after match has ended


Trivial merge