Merge branch 'master' into divVerent/skyboxes

diff --git a/env/calm_sea/calm_sea_bk.jpg b/env/calm_sea/calm_sea_bk.jpg
new file mode 100644 (file)
index 0000000..470a679
Binary files /dev/null and b/env/calm_sea/calm_sea_bk.jpg differ

diff --git a/env/calm_sea/calm_sea_dn.jpg b/env/calm_sea/calm_sea_dn.jpg
new file mode 100644 (file)
index 0000000..04a1f3c
Binary files /dev/null and b/env/calm_sea/calm_sea_dn.jpg differ

diff --git a/env/calm_sea/calm_sea_ft.jpg b/env/calm_sea/calm_sea_ft.jpg
new file mode 100644 (file)
index 0000000..4e17b77
Binary files /dev/null and b/env/calm_sea/calm_sea_ft.jpg differ

diff --git a/env/calm_sea/calm_sea_lf.jpg b/env/calm_sea/calm_sea_lf.jpg
new file mode 100644 (file)
index 0000000..e3f03e4
Binary files /dev/null and b/env/calm_sea/calm_sea_lf.jpg differ

diff --git a/env/calm_sea/calm_sea_rt.jpg b/env/calm_sea/calm_sea_rt.jpg
new file mode 100644 (file)
index 0000000..d06f9a2
Binary files /dev/null and b/env/calm_sea/calm_sea_rt.jpg differ

diff --git a/env/calm_sea/calm_sea_up.jpg b/env/calm_sea/calm_sea_up.jpg
new file mode 100644 (file)
index 0000000..2715ac4
Binary files /dev/null and b/env/calm_sea/calm_sea_up.jpg differ

diff --git a/env/distant_sunset/distant_sunset_bk.jpg b/env/distant_sunset/distant_sunset_bk.jpg
new file mode 100644 (file)
index 0000000..1ef1b34
Binary files /dev/null and b/env/distant_sunset/distant_sunset_bk.jpg differ

diff --git a/env/distant_sunset/distant_sunset_dn.jpg b/env/distant_sunset/distant_sunset_dn.jpg
new file mode 100644 (file)
index 0000000..3bf1159
Binary files /dev/null and b/env/distant_sunset/distant_sunset_dn.jpg differ

diff --git a/env/distant_sunset/distant_sunset_ft.jpg b/env/distant_sunset/distant_sunset_ft.jpg
new file mode 100644 (file)
index 0000000..9d14400
Binary files /dev/null and b/env/distant_sunset/distant_sunset_ft.jpg differ

diff --git a/env/distant_sunset/distant_sunset_lf.jpg b/env/distant_sunset/distant_sunset_lf.jpg
new file mode 100644 (file)
index 0000000..24e82ea
Binary files /dev/null and b/env/distant_sunset/distant_sunset_lf.jpg differ

diff --git a/env/distant_sunset/distant_sunset_rt.jpg b/env/distant_sunset/distant_sunset_rt.jpg
new file mode 100644 (file)
index 0000000..45697c9
Binary files /dev/null and b/env/distant_sunset/distant_sunset_rt.jpg differ

diff --git a/env/distant_sunset/distant_sunset_up.jpg b/env/distant_sunset/distant_sunset_up.jpg
new file mode 100644 (file)
index 0000000..c509074
Binary files /dev/null and b/env/distant_sunset/distant_sunset_up.jpg differ

diff --git a/env/polluted_earth/polluted_earth_bk.jpg b/env/polluted_earth/polluted_earth_bk.jpg
new file mode 100644 (file)
index 0000000..463e741
Binary files /dev/null and b/env/polluted_earth/polluted_earth_bk.jpg differ

diff --git a/env/polluted_earth/polluted_earth_dn.jpg b/env/polluted_earth/polluted_earth_dn.jpg
new file mode 100644 (file)
index 0000000..45059b0
Binary files /dev/null and b/env/polluted_earth/polluted_earth_dn.jpg differ

diff --git a/env/polluted_earth/polluted_earth_ft.jpg b/env/polluted_earth/polluted_earth_ft.jpg
new file mode 100644 (file)
index 0000000..24ee2bc
Binary files /dev/null and b/env/polluted_earth/polluted_earth_ft.jpg differ

diff --git a/env/polluted_earth/polluted_earth_lf.jpg b/env/polluted_earth/polluted_earth_lf.jpg
new file mode 100644 (file)
index 0000000..69f07c0
Binary files /dev/null and b/env/polluted_earth/polluted_earth_lf.jpg differ

diff --git a/env/polluted_earth/polluted_earth_rt.jpg b/env/polluted_earth/polluted_earth_rt.jpg
new file mode 100644 (file)
index 0000000..75b2959
Binary files /dev/null and b/env/polluted_earth/polluted_earth_rt.jpg differ

diff --git a/env/polluted_earth/polluted_earth_up.jpg b/env/polluted_earth/polluted_earth_up.jpg
new file mode 100644 (file)
index 0000000..6f989ed
Binary files /dev/null and b/env/polluted_earth/polluted_earth_up.jpg differ

diff --git a/scripts/skies_calm_sea.shader b/scripts/skies_calm_sea.shader
new file mode 100644 (file)
index 0000000..46529a6
--- /dev/null
+++ b/scripts/skies_calm_sea.shader
@@ -0,0 +1,19 @@
+//By Cuinn (cuinnton) Herrick - GPL - A calm sea of a newly terraformed planet with a thin atmosphere.
+
+textures/skies/calm_sea
+{
+       qer_editorimage textures/skies/calm_sea.jpg
+       surfaceparm sky
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       q3map_globaltexture
+       q3map_surfacelight 100
+       surfaceparm sky
+
+        nopicmip
+        nomipmaps
+
+       q3map_sunExt 0.8 0.8 0.9 150 10 45
+       skyparms env/calm_sea/calm_sea - -
+}

diff --git a/scripts/skies_distant_sunset.shader b/scripts/skies_distant_sunset.shader
new file mode 100644 (file)
index 0000000..927a110
--- /dev/null
+++ b/scripts/skies_distant_sunset.shader
@@ -0,0 +1,18 @@
+//By Cuinn (cuinnton) Herrick - GPL - A newly terraformed Mars with water and atmosphere.
+textures/skies/distant_sunset
+{
+       qer_editorimage textures/skies/distant_sunset.tga
+       surfaceparm sky
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       q3map_globaltexture
+       q3map_surfacelight 45
+       surfaceparm sky
+
+        nopicmip
+        nomipmaps
+
+       q3map_sunExt 1 0.68 0.2 180 327 30
+       skyparms env/distant_sunset/distant_sunset - -
+}

diff --git a/scripts/skies_polluted_earth.shader b/scripts/skies_polluted_earth.shader
new file mode 100644 (file)
index 0000000..8bf2e46
--- /dev/null
+++ b/scripts/skies_polluted_earth.shader
@@ -0,0 +1,19 @@
+//By Cuinn (cuinnton) Herrick - GPL - A polluted earth covered in a thick hase.
+
+textures/skies/polluted_earth
+{
+       qer_editorimage textures/polluted_earth/polluted_earth.jpg
+       surfaceparm sky
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       q3map_globaltexture
+       q3map_surfacelight 120
+       surfaceparm sky
+
+        nopicmip
+        nomipmaps
+
+       q3map_sunExt 1 0.9 0.9 250 320 30
+       skyparms env/polluted_earth/polluted_earth - -
+}

diff --git a/textures/skies/calm_sea.jpg b/textures/skies/calm_sea.jpg
new file mode 100644 (file)
index 0000000..a661d6f
Binary files /dev/null and b/textures/skies/calm_sea.jpg differ

diff --git a/textures/skies/distant_sunset.jpg b/textures/skies/distant_sunset.jpg
new file mode 100644 (file)
index 0000000..56aab27
Binary files /dev/null and b/textures/skies/distant_sunset.jpg differ

diff --git a/textures/skies/polluted_earth.jpg b/textures/skies/polluted_earth.jpg
new file mode 100644 (file)
index 0000000..d315ee8
Binary files /dev/null and b/textures/skies/polluted_earth.jpg differ