From: Rudolf Polzer Date: Wed, 4 Aug 2010 13:09:05 +0000 (+0200) Subject: Merge branch 'master' into divVerent/skyboxes X-Git-Tag: xonotic-v0.1.0preview~141^2~7 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=aa98344ec58a593b05f8a42ad7962b87b3db53a8;hp=001bb3a2bcd29494ea5ca4833147c5abdfa7ef5d 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 index 00000000..470a6797 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 index 00000000..04a1f3cc 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 index 00000000..4e17b779 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 index 00000000..e3f03e44 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 index 00000000..d06f9a21 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 index 00000000..2715ac48 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 index 00000000..1ef1b348 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 index 00000000..3bf11597 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 index 00000000..9d14400e 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 index 00000000..24e82ea9 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 index 00000000..45697c9f 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 index 00000000..c509074d 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 index 00000000..463e7411 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 index 00000000..45059b08 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 index 00000000..24ee2bcf 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 index 00000000..69f07c06 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 index 00000000..75b29597 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 index 00000000..6f989edf 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 index 00000000..46529a64 --- /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 index 00000000..927a1102 --- /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 index 00000000..8bf2e462 --- /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 index 00000000..a661d6f7 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 index 00000000..56aab273 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 index 00000000..d315ee82 Binary files /dev/null and b/textures/skies/polluted_earth.jpg differ