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

env/heaven/heaven_bk.tga [new file with mode: 0644]
env/heaven/heaven_dn.tga [new file with mode: 0644]
env/heaven/heaven_ft.tga [new file with mode: 0644]
env/heaven/heaven_lf.tga [new file with mode: 0644]
env/heaven/heaven_rt.tga [new file with mode: 0644]
env/heaven/heaven_up.tga [new file with mode: 0644]
scripts/skies_heaven.shader [new file with mode: 0644]
textures/skies/heaven.png [new file with mode: 0644]

diff --git a/env/heaven/heaven_bk.tga b/env/heaven/heaven_bk.tga
new file mode 100644 (file)
index 0000000..deaa2f4
Binary files /dev/null and b/env/heaven/heaven_bk.tga differ
diff --git a/env/heaven/heaven_dn.tga b/env/heaven/heaven_dn.tga
new file mode 100644 (file)
index 0000000..e910f4a
Binary files /dev/null and b/env/heaven/heaven_dn.tga differ
diff --git a/env/heaven/heaven_ft.tga b/env/heaven/heaven_ft.tga
new file mode 100644 (file)
index 0000000..9b331a0
Binary files /dev/null and b/env/heaven/heaven_ft.tga differ
diff --git a/env/heaven/heaven_lf.tga b/env/heaven/heaven_lf.tga
new file mode 100644 (file)
index 0000000..fadddf2
Binary files /dev/null and b/env/heaven/heaven_lf.tga differ
diff --git a/env/heaven/heaven_rt.tga b/env/heaven/heaven_rt.tga
new file mode 100644 (file)
index 0000000..f64a541
Binary files /dev/null and b/env/heaven/heaven_rt.tga differ
diff --git a/env/heaven/heaven_up.tga b/env/heaven/heaven_up.tga
new file mode 100644 (file)
index 0000000..3200445
Binary files /dev/null and b/env/heaven/heaven_up.tga differ
diff --git a/scripts/skies_heaven.shader b/scripts/skies_heaven.shader
new file mode 100644 (file)
index 0000000..c14e4d0
--- /dev/null
@@ -0,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 --git a/textures/skies/heaven.png b/textures/skies/heaven.png
new file mode 100644 (file)
index 0000000..cd76caa
Binary files /dev/null and b/textures/skies/heaven.png differ