Merge branch 'master' into m0rfar/heaven
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 13:04:56 +0000 (15:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 13:04:56 +0000 (15:04 +0200)
Conflicts:
scripts/exosystem.shader

1  2 
scripts/skies_heaven.shader
textures/skies/heaven.png

index 0000000,0000000..c14e4d0
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -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 - -
++}
index 0000000,0000000..cd76caa
new file mode 100644 (file)
Binary files differ