Merge branch 'master' into m0rfar/heaven

Conflicts:
	scripts/exosystem.shader

diff --cc scripts/skies_heaven.shader
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c14e4d0e683286d5d128bf82fdbe457d0f32f522
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/scripts/skies_heaven.shader
@@@ -1,0 -1,0 +1,14 @@@
++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 - -
++}

diff --cc textures/skies/heaven.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..cd76caa350a67d6dc677eb867fe2e86783cb3ea7
new file mode 100644 (file)
Binary files differ