Merge branch 'm0rfar/wtf'

Conflicts:
	env/exosystem/exosystem2_bk.tga
	env/exosystem/exosystem2_dn.tga
	env/exosystem/exosystem2_ft.tga
	env/exosystem/exosystem2_lf.tga
	env/exosystem/exosystem2_preview.png
	env/exosystem/exosystem2_rt.tga
	env/exosystem/exosystem2_up.tga
	env/exosystem/exosystem_bk.tga
	env/exosystem/exosystem_dn.tga
	env/exosystem/exosystem_ft.tga
	env/exosystem/exosystem_lf.tga
	env/exosystem/exosystem_preview.png
	env/exosystem/exosystem_rt.tga
	env/exosystem/exosystem_up.tga

diff --git a/env/exosystem/exosystem2_bk.tga b/env/exosystem/exosystem2_bk.tga
new file mode 100644 (file)
index 0000000..3529c9a
Binary files /dev/null and b/env/exosystem/exosystem2_bk.tga differ

diff --git a/env/exosystem/exosystem2_dn.tga b/env/exosystem/exosystem2_dn.tga
new file mode 100644 (file)
index 0000000..eb16ba0
Binary files /dev/null and b/env/exosystem/exosystem2_dn.tga differ

diff --git a/env/exosystem/exosystem2_ft.tga b/env/exosystem/exosystem2_ft.tga
new file mode 100644 (file)
index 0000000..e323551
Binary files /dev/null and b/env/exosystem/exosystem2_ft.tga differ

diff --git a/env/exosystem/exosystem2_lf.tga b/env/exosystem/exosystem2_lf.tga
new file mode 100644 (file)
index 0000000..d73f64e
Binary files /dev/null and b/env/exosystem/exosystem2_lf.tga differ

diff --git a/env/exosystem/exosystem2_preview.png b/env/exosystem/exosystem2_preview.png
new file mode 100644 (file)
index 0000000..c5e2ccd
Binary files /dev/null and b/env/exosystem/exosystem2_preview.png differ

diff --git a/env/exosystem/exosystem2_rt.tga b/env/exosystem/exosystem2_rt.tga
new file mode 100644 (file)
index 0000000..898392d
Binary files /dev/null and b/env/exosystem/exosystem2_rt.tga differ

diff --git a/env/exosystem/exosystem2_up.tga b/env/exosystem/exosystem2_up.tga
new file mode 100644 (file)
index 0000000..a7bae49
Binary files /dev/null and b/env/exosystem/exosystem2_up.tga differ

diff --git a/env/exosystem/exosystem_bk.tga b/env/exosystem/exosystem_bk.tga
new file mode 100644 (file)
index 0000000..82c3d87
Binary files /dev/null and b/env/exosystem/exosystem_bk.tga differ

diff --git a/env/exosystem/exosystem_dn.tga b/env/exosystem/exosystem_dn.tga
new file mode 100644 (file)
index 0000000..d01ef10
Binary files /dev/null and b/env/exosystem/exosystem_dn.tga differ

diff --git a/env/exosystem/exosystem_ft.tga b/env/exosystem/exosystem_ft.tga
new file mode 100644 (file)
index 0000000..799ee1b
Binary files /dev/null and b/env/exosystem/exosystem_ft.tga differ

diff --git a/env/exosystem/exosystem_lf.tga b/env/exosystem/exosystem_lf.tga
new file mode 100644 (file)
index 0000000..100970f
Binary files /dev/null and b/env/exosystem/exosystem_lf.tga differ

diff --git a/env/exosystem/exosystem_preview.png b/env/exosystem/exosystem_preview.png
new file mode 100644 (file)
index 0000000..dc5cd53
Binary files /dev/null and b/env/exosystem/exosystem_preview.png differ

diff --git a/env/exosystem/exosystem_rt.tga b/env/exosystem/exosystem_rt.tga
new file mode 100644 (file)
index 0000000..b7b78f2
Binary files /dev/null and b/env/exosystem/exosystem_rt.tga differ

diff --git a/env/exosystem/exosystem_up.tga b/env/exosystem/exosystem_up.tga
new file mode 100644 (file)
index 0000000..5f1582f
Binary files /dev/null and b/env/exosystem/exosystem_up.tga differ

diff --git a/scripts/exosystem.shader b/scripts/exosystem.shader
new file mode 100644 (file)
index 0000000..d6e7762
--- /dev/null
+++ b/scripts/exosystem.shader
@@ -0,0 +1,29 @@
+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