From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 4 Aug 2010 13:04:56 +0000 (+0200)
Subject: Merge branch 'master' into m0rfar/heaven
X-Git-Tag: xonotic-v0.1.0preview~141^2~4^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f534f2acf3ba5e8b6b22ae01d395766dfebdb8b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into m0rfar/heaven

Conflicts:
	scripts/exosystem.shader
---

7f534f2acf3ba5e8b6b22ae01d395766dfebdb8b
diff --cc scripts/skies_heaven.shader
index 00000000,00000000..c14e4d0e
new file mode 100644
--- /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 00000000,00000000..cd76caa3
new file mode 100644
Binary files differ