Merge branch 'master' into m0rfar/heaven

[xonotic/xonotic-maps.pk3dir.git] / scripts / exosystem.shader

diff --git a/scripts/exosystem.shader b/scripts/exosystem.shader
index d6e7762f86e368e023e17fe00b5b33e7d7226143..1b1dd0100e1428c84c6353ebfbab677abfc32fe0 100644 (file)
--- a/scripts/exosystem.shader
+++ b/scripts/exosystem.shader
@@ -1,29 +1,44 @@
-textures/skies/exosystem\r
-{\r
-       qer_editorimage env/exosystem/exosystem_preview.tga\r
-       \r
-       surfaceparm noimpact\r
-       surfaceparm nolightmap\r
-       surfaceparm nomarks\r
-       surfaceparm sky\r
-       \r
-       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>\r
-       q3map_sun 1 1 1 350 60 41.743\r
-       q3map_surfacelight 550\r
-       skyparms env/exosystem/exosystem - -\r
-}\r
-\r
-textures/skies/exosystem2\r
-{\r
-       qer_editorimage env/exosystem/exosystem2_preview.tga\r
-       \r
-       surfaceparm noimpact\r
-       surfaceparm nolightmap\r
-       surfaceparm nomarks\r
-       surfaceparm sky\r
-       \r
-       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>\r
-       q3map_sun 1 .40625 .17578125 150 -55.452 17.379\r
-       q3map_surfacelight 300\r
-       skyparms env/exosystem/exosystem2 - -\r
-}
\ No newline at end of file
+textures/skies/exosystem
+{
+       qer_editorimage env/exosystem/exosystem_preview.tga
+       
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm sky
+       
+       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
+       q3map_sun 1 1 1 350 60 41.743
+       q3map_surfacelight 550
+       skyparms env/exosystem/exosystem - -
+}
+
+textures/skies/exosystem2
+{
+       qer_editorimage env/exosystem/exosystem2_preview.tga
+       
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm sky
+       
+       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
+       q3map_sun 1 .40625 .17578125 150 -55.452 17.379
+       q3map_surfacelight 300
+       skyparms env/exosystem/exosystem2 - -
+}
+
+textures/skies/heaven
+{
+       qer_editorimage env/heaven/heaven_preview.tga
+       
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm sky
+       
+       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
+       q3map_sun .9607843137254902 .7176470588235294 .3803921568627451 350 270 10
+       q3map_surfacelight 300
+       skyparms env/heaven/heaven - -
+}