From: Samual Lenks <samual@xonotic.org>
Date: Mon, 30 Dec 2013 17:52:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/shownames_minalpha'
X-Git-Tag: xonotic-v0.8.0~249
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c406c4bd7f2408b586ba09a492a9cef86ef15ee;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/shownames_minalpha'

# By Samual Lenks (3) and Mario (1)
* origin/Mario/shownames_minalpha:
  Multiply shownames alpha by player alpha
  Allow shownames to be seen with low alpha if they're the same team
  Clean some things up
  Hide player name if their alpha is below a limit
---

1c406c4bd7f2408b586ba09a492a9cef86ef15ee