From: Mirio <opivy@hotmail.de>
Date: Wed, 8 Mar 2017 15:54:14 +0000 (+0100)
Subject: Update shader
X-Git-Tag: xonotic-v0.8.2~79^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b06bb7bc12ab6f652bd15342c799013c0676699;p=xonotic%2Fxonotic-maps.pk3dir.git

Update shader
---

diff --git a/maps/geoplanetary.map b/maps/geoplanetary.map
index 2348a871..876d69e0 100644
--- 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 d467c1ba..32ac4b2a 100644
--- 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
index 7bc2945c..00000000
Binary files a/maps/geoplanetary.tga and /dev/null differ
diff --git a/scripts/map_geoplanetary.shader b/scripts/map_geoplanetary.shader
index 20a9c1b9..7e3957e0 100644
--- 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