Merge branch 'maddin/textures-phillipk2x-cleanup' into 'master'
authorMirio <opivy@hotmail.de>
Thu, 1 Oct 2015 10:30:44 +0000 (10:30 +0000)
committerMirio <opivy@hotmail.de>
Thu, 1 Oct 2015 10:30:44 +0000 (10:30 +0000)
commit170a460c0c1a68cb8d914baf7b4064a5d77cfe27
tree72396631b7243251082198b17fc70b961b2b7121
parentd87bbbb9ca3d1505c08cf3375df16774813f6648
parent471b21499da9de00c31d3525dcd941003b75e18f
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