From: monad <monadxon@aol.com>
Date: Sun, 9 Jun 2013 20:01:11 +0000 (+0200)
Subject: New fe26 shader
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72f889105550e294b326b93749f53d9591fb2648;p=xonotic%2Fxonotic-maps.pk3dir.git

New fe26 shader
---

diff --git a/maps/fe26.map b/maps/fe26.map
index 1e907fc4..015c7f7e 100644
--- a/maps/fe26.map
+++ b/maps/fe26.map
@@ -9689,7 +9689,7 @@ brushDef
 {
 brushDef
 {
-( 576 -320 768 ) ( 576 -384 768 ) ( 512 -320 480 ) ( ( 0.0078125 0 509.5 ) ( 0 0.0076264618 6.1705880165 ) ) map_fe26/fe26 134217728 0 0
+( 575 -320 768 ) ( 575 -384 768 ) ( 511 -320 480 ) ( ( 0.0078125 0 509.5 ) ( 0 0.0076264618 6.1689333916 ) ) map_fe26/fe26 134217728 0 0
 ( 640 -320 768 ) ( 576 -320 768 ) ( 576 -320 480 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodraw 134217728 0 0
 ( 640 -384 768 ) ( 640 -320 768 ) ( 576 -320 480 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodraw 134217728 0 0
 ( 576 -448 768 ) ( 640 -448 768 ) ( 512 -448 480 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodraw 134217728 0 0
diff --git a/scripts/map_fe26.shader b/scripts/map_fe26.shader
index 7e180dfa..f3f2b594 100644
--- a/scripts/map_fe26.shader
+++ b/scripts/map_fe26.shader
@@ -45,13 +45,14 @@ textures/map_fe26/teleporter
 
 textures/map_fe26/fe26
 {
-	nopicmip
+	surfaceparm nomarks
 	surfaceparm trans
-	polygonOffset
-	sort 6
+	surfaceparm nonsolid
+	surfaceparm pointlight
+	nopicmip
 	{
 		map textures/map_fe26/fe26
-		blendFunc filter
 		rgbGen identity
+		blendFunc add
 	}
 }
diff --git a/textures/map_fe26/fe26.tga b/textures/map_fe26/fe26.tga
new file mode 100644
index 00000000..05b22076
Binary files /dev/null and b/textures/map_fe26/fe26.tga differ
diff --git a/textures/map_fe26/fe26.xcf b/textures/map_fe26/fe26.xcf
index 70c5ea4b..33fe9f9a 100644
Binary files a/textures/map_fe26/fe26.xcf and b/textures/map_fe26/fe26.xcf differ