Update shader

diff --git a/maps/geoplanetary.map b/maps/geoplanetary.map
index 2348a87115267c141a388d20a90c52a86fc02474..876d69e030f481b8bf44ba51b094677f0f80a5d7 100644 (file)
--- a/maps/geoplanetary.map
+++ b/maps/geoplanetary.map
@@ -1,9 +1,8 @@
 {
 "classname" "worldspawn"
-"author" "mintOX"
-"license" "GPL"
-"message" "geoplanetary"
-"description" "remake of geomonetary for xonotic"
+"author" "MintOX, Debugger, Mirio"
+"message" "Geoplanetary"
+"_description" "Geomonetary in space"
 {
 ( 160 -192 64 ) ( -192 -192 0 ) ( 160 64 64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 160 64 64 ) ( 96 64 64 ) ( 160 64 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0

diff --git a/maps/geoplanetary.mapinfo b/maps/geoplanetary.mapinfo
index d467c1bab4c7ff9c4ca946805127afaff227f2f1..32ac4b2ac88df4b8d30442115c4b3e6516af2bc5 100644 (file)
--- a/maps/geoplanetary.mapinfo
+++ b/maps/geoplanetary.mapinfo
@@ -1,16 +1,10 @@
 title Geoplanetary
 description Geomonetary in space
 author MintOX, Debugger, Mirio
-cdtrack 18
+cdtrack 17
 has weapons
 gametype ctf
 gametype dom
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
-
-//For my daughter Alysa. Thanks for all your help. I love you boo! 
-//Thanks to Dokujisan and ohters on HOCFT that helped!
-
-//Released 5/17/2010
-//mintox.nex@gmail.com
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/geoplanetary.tga b/maps/geoplanetary.tga
deleted file mode 100644 (file)
index 7bc2945..0000000
Binary files a/maps/geoplanetary.tga and /dev/null differ

diff --git a/scripts/map_geoplanetary.shader b/scripts/map_geoplanetary.shader
index 20a9c1b9d9abfbf8975659951831203586a5522b..7e3957e04f37e57f16fac7a060e496e9bd5c22cc 100644 (file)
--- a/scripts/map_geoplanetary.shader
+++ b/scripts/map_geoplanetary.shader
@@ -18,48 +18,4 @@ map textures/map_geoplanetary/wiz1_4_mesh.jpg
 blendfunc add
                        
 } 
-}
-
-textures/map_geoplanetary/scanline
-{
-       
-nopicmip
-       qer_editorimage textures/map_geoplanetary/scanline.jpg
-       q3map_lightimage textures/map_geoplanetary/scanline.jpg
-       surfaceparm nolightmap
-
-       surfaceparm nomarks
-       surfaceparm trans
-       qer_trans 0.5
-{      
-map textures/map_geoplanetary/scanline.jpg     
-blendfunc add
-       
-tcMod turb 0 0.15 0 0.15
-       
-tcmod scroll 0 0.3 
-               
-} 
-}
-
-textures/map_geoplanetary/screen
-{
-       nopicmip
-       qer_editorimage textures/map_geoplanetary/hoctf0201.jpg
-       q3map_lightimage textures/map_geoplanetary/hoctf0201.jpg
-       surfaceparm nolightmap
-
-       surfaceparm nomarks
-       
-       
-{
-       
-       
-       
-       map textures/map_geoplanetary/hoctf0201.jpg
-       
-       animmap .2 textures/map_geoplanetary/xonoticlogo.jpg textures/map_geoplanetary/geoplanetary.jpg 
-}
-
-
-}
+}
\ No newline at end of file