From: Mario <zacjardine@y7mail.com>
Date: Sat, 22 Oct 2016 21:30:55 +0000 (+0000)
Subject: Merge branch 'DefaultUser/forceplayercolors_menu_update' into 'master'
X-Git-Tag: xonotic-v0.8.2~478
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19ffa3b694dc16f8c99c6e491176b71fc5b02f51;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'DefaultUser/forceplayercolors_menu_update' into 'master'

add new option for cl_forceplayercolor to the menu

Change textbox to slider

See merge request !379
---

19ffa3b694dc16f8c99c6e491176b71fc5b02f51