From: Debugger Date: Wed, 3 Dec 2014 17:18:23 +0000 (+0100) Subject: adapted nebulae with less brightness, fixed some lights X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=612945409213c2e8134898bf5539d90d020e8c1b;p=xonotic%2Fxonotic-maps.pk3dir.git adapted nebulae with less brightness, fixed some lights --- diff --git a/env/extragalactic_reduced/nebulae_bk.tga b/env/extragalactic_reduced/nebulae_bk.tga new file mode 100644 index 00000000..d3e792d4 Binary files /dev/null and b/env/extragalactic_reduced/nebulae_bk.tga differ diff --git a/env/extragalactic_reduced/nebulae_dn.tga b/env/extragalactic_reduced/nebulae_dn.tga new file mode 100644 index 00000000..1e59ba42 Binary files /dev/null and b/env/extragalactic_reduced/nebulae_dn.tga differ diff --git a/env/extragalactic_reduced/nebulae_ft.tga b/env/extragalactic_reduced/nebulae_ft.tga new file mode 100644 index 00000000..747908fc Binary files /dev/null and b/env/extragalactic_reduced/nebulae_ft.tga differ diff --git a/env/extragalactic_reduced/nebulae_lf.tga b/env/extragalactic_reduced/nebulae_lf.tga new file mode 100644 index 00000000..1fe05341 Binary files /dev/null and b/env/extragalactic_reduced/nebulae_lf.tga differ diff --git a/env/extragalactic_reduced/nebulae_rt.tga b/env/extragalactic_reduced/nebulae_rt.tga new file mode 100644 index 00000000..6fd8d431 Binary files /dev/null and b/env/extragalactic_reduced/nebulae_rt.tga differ diff --git a/env/extragalactic_reduced/nebulae_up.tga b/env/extragalactic_reduced/nebulae_up.tga new file mode 100644 index 00000000..cd21e5fa Binary files /dev/null and b/env/extragalactic_reduced/nebulae_up.tga differ diff --git a/maps/go.map b/maps/go.map index 88af817f..f77ca746 100644 --- a/maps/go.map +++ b/maps/go.map @@ -18329,22 +18329,22 @@ map_go/jumppadfx_blue { "classname" "light" "origin" "-208.000000 1424.000000 -112.000000" -"light" "50" +"light" "25" } { "classname" "light" "origin" "-208.000000 1424.000000 -400.000000" -"light" "50" +"light" "25" } { "classname" "light" "origin" "-208.000000 1424.000000 -752.000000" -"light" "50" +"light" "25" } { "classname" "light" "origin" "-208.000000 1424.000000 -1040.000000" -"light" "50" +"light" "25" } { "classname" "item_armor_small" @@ -18764,7 +18764,7 @@ map_go/jumppadfx_blue } { "classname" "target_position" -"origin" "952.000000 264.000000 192.000000" +"origin" "960.000000 256.000000 192.000000" "targetname" "target_position24" } { @@ -19266,15 +19266,15 @@ map_go/jumppadfx_blue } { "classname" "misc_model" -"origin" "816.000000 3024.000000 968.000000" +"origin" "816.000061 3023.999756 968.000000" "model" "models/ventilation/ventpanel1.ase" -"angle" "90.000000" +"angle" "-89.999992" } { "classname" "misc_model" -"origin" "816.000000 3024.000000 648.000000" +"origin" "816.000061 3023.999756 648.000000" "model" "models/ventilation/ventpanel1.ase" -"angle" "90.000000" +"angle" "-89.999992" } { "classname" "func_clientillusionary" @@ -19604,22 +19604,22 @@ map_go/jumppadfx_blue { "classname" "light" "origin" "2384.000000 3824.000000 -112.000000" -"light" "50" +"light" "25" } { "classname" "light" "origin" "2384.000000 3824.000000 -400.000000" -"light" "50" +"light" "25" } { "classname" "light" "origin" "2384.000000 3824.000000 -752.000000" -"light" "50" +"light" "25" } { "classname" "light" "origin" "2384.000000 3824.000000 -1040.000000" -"light" "50" +"light" "25" } { "classname" "item_armor_small" @@ -20056,7 +20056,7 @@ map_go/jumppadfx_blue } { "classname" "target_position" -"origin" "1224.000000 4984.000000 192.000000" +"origin" "1216.000000 4992.000000 192.000000" "targetname" "target_position49" "angle" "-179.999985" } @@ -20497,15 +20497,15 @@ map_go/jumppadfx_blue } { "classname" "misc_model" -"origin" "1360.000000 2224.000000 968.000000" +"origin" "1360.000244 2224.000000 968.000000" "model" "models/ventilation/ventpanel1.ase" -"angle" "-90.000000" +"angle" "90.000000" } { "classname" "misc_model" -"origin" "1360.000000 2224.000000 648.000000" +"origin" "1360.000244 2224.000000 648.000000" "model" "models/ventilation/ventpanel1.ase" -"angle" "-90.000000" +"angle" "90.000000" } { "classname" "func_clientillusionary" diff --git a/maps/go.map.options b/maps/go.map.options index 0f403230..9f973c7e 100644 --- a/maps/go.map.options +++ b/maps/go.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 0.4 +Version: 0.9 diff --git a/scripts/map_go.shader b/scripts/map_go.shader index 320a42dc..0140727c 100644 --- a/scripts/map_go.shader +++ b/scripts/map_go.shader @@ -74,4 +74,19 @@ textures/map_go/pipe1_red map textures/map_go/pipe1_red.tga blendfunc GL_SRC_ALPHA GL_ONE } +} + +textures/map_go/extragalactic_nebulae_reduced +{ + qer_editorimage textures/map_go/extragalactic_nebulae_reduced.jpg + surfaceparm sky + surfaceparm nolightmap + surfaceparm nodlight + surfaceparm noimpact + surfaceparm nomarks + + skyparms env/extragalactic_reduced/nebulae - - //farbox cloudheight nearbox + q3map_skyLight 40 4 //amount iterations + q3map_sunExt 1 0.9 0.8 300 66 36 3 16 //rgb intensity degrees elevation deviance samples + q3map_skylight 40 4 } \ No newline at end of file diff --git a/textures/map_go/extragalactic_nebulae_reduced.jpg b/textures/map_go/extragalactic_nebulae_reduced.jpg new file mode 100644 index 00000000..6c6818f9 Binary files /dev/null and b/textures/map_go/extragalactic_nebulae_reduced.jpg differ