From: Mario <mario.mario@y7mail.com>
Date: Sun, 27 Nov 2022 01:52:10 +0000 (+0000)
Subject: Merge branch 'Mario/vortex_playercolors' into 'master'
X-Git-Tag: xonotic-v0.8.6~287
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed61856a301d256a179b22ecfb9fb7fa032eb477;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/vortex_playercolors' into 'master'

Use the player's color for Vortex charging instead of predefined colors

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

ed61856a301d256a179b22ecfb9fb7fa032eb477