From: Mirio <opivy@hotmail.de>
Date: Thu, 1 Oct 2015 10:30:44 +0000 (+0000)
Subject: Merge branch 'maddin/textures-phillipk2x-cleanup' into 'master'
X-Git-Tag: xonotic-v0.8.2~160
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=170a460c0c1a68cb8d914baf7b4064a5d77cfe27;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'maddin/textures-phillipk2x-cleanup' into 'master'

Maddin/textures phillipk2x cleanup

This cleans up the phillipk2x shaders and adds some features:
* Overall better formatting of the shader file.
* Shaders that have an alpha channel, like grates, now work properly.
* Decals are now decals and not opaque textures.
* The glow of all light and computer textures has been adjusted to show their respective colour instead of pure white.

See merge request !46
---

170a460c0c1a68cb8d914baf7b4064a5d77cfe27