Change some skies a bit. Now to recompile the necessary maps...

diff --git a/data/env/asteroids/asteroids.tga b/data/env/asteroids/asteroids.tga
new file mode 100644 (file)
index 0000000..f71bd83
Binary files /dev/null and b/data/env/asteroids/asteroids.tga differ

diff --git a/data/env/asteroids/asteroids_bk.tga b/data/env/asteroids/asteroids_bk.tga
new file mode 100644 (file)
index 0000000..e10a2ec
Binary files /dev/null and b/data/env/asteroids/asteroids_bk.tga differ

diff --git a/data/env/asteroids/asteroids_dn.tga b/data/env/asteroids/asteroids_dn.tga
new file mode 100644 (file)
index 0000000..fd08d05
Binary files /dev/null and b/data/env/asteroids/asteroids_dn.tga differ

diff --git a/data/env/asteroids/asteroids_ft.tga b/data/env/asteroids/asteroids_ft.tga
new file mode 100644 (file)
index 0000000..c4ff4ab
Binary files /dev/null and b/data/env/asteroids/asteroids_ft.tga differ

diff --git a/data/env/asteroids/asteroids_lf.tga b/data/env/asteroids/asteroids_lf.tga
new file mode 100644 (file)
index 0000000..cc0bc75
Binary files /dev/null and b/data/env/asteroids/asteroids_lf.tga differ

diff --git a/data/env/asteroids/asteroids_rt.tga b/data/env/asteroids/asteroids_rt.tga
new file mode 100644 (file)
index 0000000..47efce6
Binary files /dev/null and b/data/env/asteroids/asteroids_rt.tga differ

diff --git a/data/env/asteroids/asteroids_up.tga b/data/env/asteroids/asteroids_up.tga
new file mode 100644 (file)
index 0000000..02def09
Binary files /dev/null and b/data/env/asteroids/asteroids_up.tga differ

diff --git a/data/env/nebulae/nebulae.tga b/data/env/nebulae/nebulae.tga
new file mode 100644 (file)
index 0000000..279e876
Binary files /dev/null and b/data/env/nebulae/nebulae.tga differ

diff --git a/data/env/nebulae/nebulae_bk.tga b/data/env/nebulae/nebulae_bk.tga
new file mode 100644 (file)
index 0000000..8a9e5ab
Binary files /dev/null and b/data/env/nebulae/nebulae_bk.tga differ

diff --git a/data/env/nebulae/nebulae_dn.tga b/data/env/nebulae/nebulae_dn.tga
new file mode 100644 (file)
index 0000000..f93c0dd
Binary files /dev/null and b/data/env/nebulae/nebulae_dn.tga differ

diff --git a/data/env/nebulae/nebulae_ft.tga b/data/env/nebulae/nebulae_ft.tga
new file mode 100644 (file)
index 0000000..4a1cd69
Binary files /dev/null and b/data/env/nebulae/nebulae_ft.tga differ

diff --git a/data/env/nebulae/nebulae_lf.tga b/data/env/nebulae/nebulae_lf.tga
new file mode 100644 (file)
index 0000000..5001959
Binary files /dev/null and b/data/env/nebulae/nebulae_lf.tga differ

diff --git a/data/env/nebulae/nebulae_rt.tga b/data/env/nebulae/nebulae_rt.tga
new file mode 100644 (file)
index 0000000..44314da
Binary files /dev/null and b/data/env/nebulae/nebulae_rt.tga differ

diff --git a/data/env/nebulae/nebulae_up.tga b/data/env/nebulae/nebulae_up.tga
new file mode 100644 (file)
index 0000000..fe31974
Binary files /dev/null and b/data/env/nebulae/nebulae_up.tga differ

diff --git a/data/env/newsky_asteroids/asteroids.tga b/data/env/newsky_asteroids/asteroids.tga
deleted file mode 100644 (file)
index f71bd83..0000000
Binary files a/data/env/newsky_asteroids/asteroids.tga and /dev/null differ

diff --git a/data/env/newsky_asteroids/asteroids_bk.tga b/data/env/newsky_asteroids/asteroids_bk.tga
deleted file mode 100644 (file)
index e10a2ec..0000000
Binary files a/data/env/newsky_asteroids/asteroids_bk.tga and /dev/null differ

diff --git a/data/env/newsky_asteroids/asteroids_dn.tga b/data/env/newsky_asteroids/asteroids_dn.tga
deleted file mode 100644 (file)
index fd08d05..0000000
Binary files a/data/env/newsky_asteroids/asteroids_dn.tga and /dev/null differ

diff --git a/data/env/newsky_asteroids/asteroids_ft.tga b/data/env/newsky_asteroids/asteroids_ft.tga
deleted file mode 100644 (file)
index c4ff4ab..0000000
Binary files a/data/env/newsky_asteroids/asteroids_ft.tga and /dev/null differ

diff --git a/data/env/newsky_asteroids/asteroids_lf.tga b/data/env/newsky_asteroids/asteroids_lf.tga
deleted file mode 100644 (file)
index cc0bc75..0000000
Binary files a/data/env/newsky_asteroids/asteroids_lf.tga and /dev/null differ

diff --git a/data/env/newsky_asteroids/asteroids_rt.tga b/data/env/newsky_asteroids/asteroids_rt.tga
deleted file mode 100644 (file)
index 47efce6..0000000
Binary files a/data/env/newsky_asteroids/asteroids_rt.tga and /dev/null differ

diff --git a/data/env/newsky_asteroids/asteroids_up.tga b/data/env/newsky_asteroids/asteroids_up.tga
deleted file mode 100644 (file)
index 02def09..0000000
Binary files a/data/env/newsky_asteroids/asteroids_up.tga and /dev/null differ

diff --git a/data/env/newsky_nebulae/nebulae.tga b/data/env/newsky_nebulae/nebulae.tga
deleted file mode 100644 (file)
index 279e876..0000000
Binary files a/data/env/newsky_nebulae/nebulae.tga and /dev/null differ

diff --git a/data/env/newsky_nebulae/nebulae_bk.tga b/data/env/newsky_nebulae/nebulae_bk.tga
deleted file mode 100644 (file)
index 8a9e5ab..0000000
Binary files a/data/env/newsky_nebulae/nebulae_bk.tga and /dev/null differ

diff --git a/data/env/newsky_nebulae/nebulae_dn.tga b/data/env/newsky_nebulae/nebulae_dn.tga
deleted file mode 100644 (file)
index f93c0dd..0000000
Binary files a/data/env/newsky_nebulae/nebulae_dn.tga and /dev/null differ

diff --git a/data/env/newsky_nebulae/nebulae_ft.tga b/data/env/newsky_nebulae/nebulae_ft.tga
deleted file mode 100644 (file)
index 4a1cd69..0000000
Binary files a/data/env/newsky_nebulae/nebulae_ft.tga and /dev/null differ

diff --git a/data/env/newsky_nebulae/nebulae_lf.tga b/data/env/newsky_nebulae/nebulae_lf.tga
deleted file mode 100644 (file)
index 5001959..0000000
Binary files a/data/env/newsky_nebulae/nebulae_lf.tga and /dev/null differ

diff --git a/data/env/newsky_nebulae/nebulae_rt.tga b/data/env/newsky_nebulae/nebulae_rt.tga
deleted file mode 100644 (file)
index 44314da..0000000
Binary files a/data/env/newsky_nebulae/nebulae_rt.tga and /dev/null differ

diff --git a/data/env/newsky_nebulae/nebulae_up.tga b/data/env/newsky_nebulae/nebulae_up.tga
deleted file mode 100644 (file)
index fe31974..0000000
Binary files a/data/env/newsky_nebulae/nebulae_up.tga and /dev/null differ

diff --git a/data/env/newsky_planets/planets.tga b/data/env/newsky_planets/planets.tga
deleted file mode 100644 (file)
index f629675..0000000
Binary files a/data/env/newsky_planets/planets.tga and /dev/null differ

diff --git a/data/env/newsky_planets/planets_bk.tga b/data/env/newsky_planets/planets_bk.tga
deleted file mode 100644 (file)
index 0b2d863..0000000
Binary files a/data/env/newsky_planets/planets_bk.tga and /dev/null differ

diff --git a/data/env/newsky_planets/planets_dn.tga b/data/env/newsky_planets/planets_dn.tga
deleted file mode 100644 (file)
index f223aec..0000000
Binary files a/data/env/newsky_planets/planets_dn.tga and /dev/null differ

diff --git a/data/env/newsky_planets/planets_ft.tga b/data/env/newsky_planets/planets_ft.tga
deleted file mode 100644 (file)
index 3ba479d..0000000
Binary files a/data/env/newsky_planets/planets_ft.tga and /dev/null differ

diff --git a/data/env/newsky_planets/planets_lf.tga b/data/env/newsky_planets/planets_lf.tga
deleted file mode 100644 (file)
index 8a8fad2..0000000
Binary files a/data/env/newsky_planets/planets_lf.tga and /dev/null differ

diff --git a/data/env/newsky_planets/planets_rt.tga b/data/env/newsky_planets/planets_rt.tga
deleted file mode 100644 (file)
index 1edf5a0..0000000
Binary files a/data/env/newsky_planets/planets_rt.tga and /dev/null differ

diff --git a/data/env/newsky_planets/planets_up.tga b/data/env/newsky_planets/planets_up.tga
deleted file mode 100644 (file)
index 4df756b..0000000
Binary files a/data/env/newsky_planets/planets_up.tga and /dev/null differ

diff --git a/data/env/planets/planets.tga b/data/env/planets/planets.tga
new file mode 100644 (file)
index 0000000..f629675
Binary files /dev/null and b/data/env/planets/planets.tga differ

diff --git a/data/env/planets/planets_bk.tga b/data/env/planets/planets_bk.tga
new file mode 100644 (file)
index 0000000..0b2d863
Binary files /dev/null and b/data/env/planets/planets_bk.tga differ

diff --git a/data/env/planets/planets_dn.tga b/data/env/planets/planets_dn.tga
new file mode 100644 (file)
index 0000000..f223aec
Binary files /dev/null and b/data/env/planets/planets_dn.tga differ

diff --git a/data/env/planets/planets_ft.tga b/data/env/planets/planets_ft.tga
new file mode 100644 (file)
index 0000000..3ba479d
Binary files /dev/null and b/data/env/planets/planets_ft.tga differ

diff --git a/data/env/planets/planets_lf.tga b/data/env/planets/planets_lf.tga
new file mode 100644 (file)
index 0000000..8a8fad2
Binary files /dev/null and b/data/env/planets/planets_lf.tga differ

diff --git a/data/env/planets/planets_rt.tga b/data/env/planets/planets_rt.tga
new file mode 100644 (file)
index 0000000..1edf5a0
Binary files /dev/null and b/data/env/planets/planets_rt.tga differ

diff --git a/data/env/planets/planets_up.tga b/data/env/planets/planets_up.tga
new file mode 100644 (file)
index 0000000..4df756b
Binary files /dev/null and b/data/env/planets/planets_up.tga differ

diff --git a/data/scripts/newsky_asteroids.shader b/data/scripts/newsky_asteroids.shader
deleted file mode 100644 (file)
index fe6ed96..0000000
--- a/data/scripts/newsky_asteroids.shader
+++ /dev/null
@@ -1,12 +0,0 @@
-textures/newskies/asteroids
-{
-       qer_editorimage env/newsky_asteroids/asteroids.tga
-       surfaceparm sky
-       surfaceparm nolightmap
-       surfaceparm nodlight
-       surfaceparm noimpact
-       surfaceparm nomarks
-
-       skyparms env/newsky_asteroids/asteroids - - //farbox cloudheight nearbox
-       q3map_sunExt 1 0.75 0.5 320 27 42 0 16 //rgb intensity degrees elevation deviance samples
-}

diff --git a/data/scripts/newsky_nebulae.txt b/data/scripts/newsky_nebulae.txt
deleted file mode 100644 (file)
index ebfe5f2..0000000
--- a/data/scripts/newsky_nebulae.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-================================================================================
-NewSky - Nebulae
-================================================================================
-
-Version:  1.0
-Released: October 2009
-Author:   Severin "sev" Meyer
-
-Created for Nexuiz and first released at <http://www.alientrap.org/forum/>
-
-================================================================================
-Blender and Gimp
-================================================================================
-
-To create the skybox images, I used the method explained here:\r
-<http://en.wikibooks.org/wiki/Blender_3D:_Noob_to_Pro/Build_a_skybox>\r
-\r
-In short, the environment is projected onto a cube with an EnvMap material,
-and after the rendering, the projection can be extracted with "Save EnvMap",
-found in the Texture Panel.
-
-However, objects with manipulated normals are not rendered seamlessly, so
-I rendered them seperately and then projected those renderings onto the cube.
-
-To cut the Envmap into 6 correctly named images, I wrote a script for Gimp,
-you can find it in the /gimp/ folder. Put it in ~/.gimp*/scripts/ (Linux)
-
-================================================================================
-GNU General Public License
-================================================================================
-
-I release all the files that are part of this project under the terms of the
-GNU General Public License as published by the Free Software Foundation, either
-version 2 of the License, or any later version. <http://www.gnu.org/licenses/>
-\r
-All the files that are part of this project are distributed in the hope
-that they will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-================================================================================
-Credits
-================================================================================
-
-The programs I used: Blender, Gimp, Inkscape, gedit, p7zip
-
-Though I didn't use any of them directly, I learned a lot by studying materials
-from the Blender Open Material Repository <www.blender-materials.org>, of which
-I especially would like to mention "Sun" by walross and "Magmatic" by bohemix.
-

diff --git a/data/scripts/newsky_planets.shader b/data/scripts/newsky_planets.shader
deleted file mode 100644 (file)
index 5caab89..0000000
--- a/data/scripts/newsky_planets.shader
+++ /dev/null
@@ -1,12 +0,0 @@
-textures/newskies/planets
-{
-       qer_editorimage env/newsky_planets/planets.tga
-       surfaceparm sky
-       surfaceparm nolightmap
-       surfaceparm nodlight
-       surfaceparm noimpact
-       surfaceparm nomarks
-
-       skyparms env/newsky_planets/planets - - //farbox cloudheight nearbox
-       q3map_sunExt 1 0.9 0.8 320 124 42 0 16 //rgb intensity degrees elevation deviance samples
-}

diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt
index 56191900d7e208bfc898aa7eff985992007c4df2..d9110a66ac29d36493a363a9fea112b9d683effb 100644 (file)
--- a/data/scripts/shaderlist.txt
+++ b/data/scripts/shaderlist.txt
@@ -30,9 +30,9 @@ liquids
 mandelbrotsky\r
 mflag\r
 morphed\r
-newsky_asteroids\r
-newsky_nebulae\r
-newsky_planets\r
+sky_asteroids\r
+sky_nebulae\r
+sky_planets\r
 nexdm18_rmx\r
 official_cmp1\r
 onslaught\r

diff --git a/data/scripts/sky_asteroids.shader b/data/scripts/sky_asteroids.shader
new file mode 100644 (file)
index 0000000..39116ba
--- /dev/null
+++ b/data/scripts/sky_asteroids.shader
@@ -0,0 +1,12 @@
+textures/skies/asteroids
+{
+       qer_editorimage env/asteroids/asteroids.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/asteroids/asteroids - - //farbox cloudheight nearbox
+       q3map_sunExt 1 0.75 0.5 320 27 42 0 16 //rgb intensity degrees elevation deviance samples
+}

diff --git a/data/scripts/sky_nebulae.shader b/data/scripts/sky_nebulae.shader
new file mode 100644 (file)
index 0000000..78aff40
--- /dev/null
+++ b/data/scripts/sky_nebulae.shader
@@ -0,0 +1,14 @@
+textures/skies/nebulae
+{
+       qer_editorimage env/nebulae/nebulae.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/nebulae/nebulae - - //farbox cloudheight nearbox
+    q3map_skyLight 50 4 //amount iterations
+       q3map_sunExt 1 0.9 0.8 300 66 36 3 16 //rgb intensity degrees elevation deviance samples
+       q3map_skylight 50 4
+}
\ No newline at end of file

diff --git a/data/scripts/sky_nebulae.txt b/data/scripts/sky_nebulae.txt
new file mode 100644 (file)
index 0000000..ebfe5f2
--- /dev/null
+++ b/data/scripts/sky_nebulae.txt
@@ -0,0 +1,49 @@
+================================================================================
+NewSky - Nebulae
+================================================================================
+
+Version:  1.0
+Released: October 2009
+Author:   Severin "sev" Meyer
+
+Created for Nexuiz and first released at <http://www.alientrap.org/forum/>
+
+================================================================================
+Blender and Gimp
+================================================================================
+
+To create the skybox images, I used the method explained here:\r
+<http://en.wikibooks.org/wiki/Blender_3D:_Noob_to_Pro/Build_a_skybox>\r
+\r
+In short, the environment is projected onto a cube with an EnvMap material,
+and after the rendering, the projection can be extracted with "Save EnvMap",
+found in the Texture Panel.
+
+However, objects with manipulated normals are not rendered seamlessly, so
+I rendered them seperately and then projected those renderings onto the cube.
+
+To cut the Envmap into 6 correctly named images, I wrote a script for Gimp,
+you can find it in the /gimp/ folder. Put it in ~/.gimp*/scripts/ (Linux)
+
+================================================================================
+GNU General Public License
+================================================================================
+
+I release all the files that are part of this project under the terms of the
+GNU General Public License as published by the Free Software Foundation, either
+version 2 of the License, or any later version. <http://www.gnu.org/licenses/>
+\r
+All the files that are part of this project are distributed in the hope
+that they will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+================================================================================
+Credits
+================================================================================
+
+The programs I used: Blender, Gimp, Inkscape, gedit, p7zip
+
+Though I didn't use any of them directly, I learned a lot by studying materials
+from the Blender Open Material Repository <www.blender-materials.org>, of which
+I especially would like to mention "Sun" by walross and "Magmatic" by bohemix.
+

diff --git a/data/scripts/sky_planets.shader b/data/scripts/sky_planets.shader
new file mode 100644 (file)
index 0000000..25d6473
--- /dev/null
+++ b/data/scripts/sky_planets.shader
@@ -0,0 +1,12 @@
+textures/skies/planets
+{
+       qer_editorimage env/planets/planets.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/planets/planets - - //farbox cloudheight nearbox
+       q3map_sunExt 1 0.9 0.8 320 124 42 0 16 //rgb intensity degrees elevation deviance samples
+}