Merge branch 'devel'

This commit is contained in:
Marisa the Magician 2019-05-03 17:27:25 +02:00
commit c3c41a509d
593 changed files with 225 additions and 26 deletions

View file

@ -504,6 +504,14 @@ Brightmap Texture "models/Chunk_a11.png"
{
Map "brightmaps/Chunk_a11.png"
}
HardwareShader Texture "models/JChainSawPick1.png"
{
Shader "shaders/glsl/AmbientGlow.fp"
}
HardwareShader Texture "models/jbarrel4.png"
{
Shader "shaders/glsl/AmbientGlow.fp"
}
PulseLight "UTRedKeyLight"
{
Color 1.0 0.0 0.0