]> 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: 2639335 3c92b95)
Merge remote-tracking branch 'origin/Mario/shownames_minalpha'
authorSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 17:52:06 +0000 (12:52 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 17:52:06 +0000 (12:52 -0500)
# 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


Trivial merge