From: terencehill <piuntn@gmail.com>
Date: Mon, 12 Jun 2023 17:35:53 +0000 (+0000)
Subject: Merge branch 'drjaska/terencehill/survival_scoreboard_colors_fix' into 'master'
X-Git-Tag: xonotic-v0.8.6~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9595bebf1c0c7e132d57e21d56b85673dd823538;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/terencehill/survival_scoreboard_colors_fix' into 'master'

Simpler implementation of !1200 and fixes to !1195

Closes #2844

See merge request xonotic/xonotic-data.pk3dir!1201
---

9595bebf1c0c7e132d57e21d56b85673dd823538