From e932ba539ab29e8ecb3838a8658243480608bbcf Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Thu, 16 Jul 2009 19:32:56 +0000
Subject: Added yellow, orange colors.

---
 base/materials/colors.shader    |  66 +++++++++++++++++++++++++++++-----------
 base/textures/colors/orange.tga | Bin 0 -> 364 bytes
 base/textures/colors/yellow.tga | Bin 0 -> 364 bytes
 3 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 base/textures/colors/orange.tga
 create mode 100644 base/textures/colors/yellow.tga

(limited to 'base')

diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index b0be692..8054ffc 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -2,14 +2,14 @@ textures/colors/black
 {
 	qer_editorimage textures/colors/black
 	color 0.00 0.00 0.00
-	environment sky
+	environment
 }
 
 textures/colors/black_bright
 {
 	qer_editorimage textures/colors/black
 	color 0.00 0.00 0.00
-	environment sky
+	environment
 	bright
 }
 
@@ -17,14 +17,14 @@ textures/colors/white
 {
 	qer_editorimage textures/colors/white
 	color 1.00 1.00 1.00
-	environment sky
+	environment
 }
 
 textures/colors/white_bright
 {
 	qer_editorimage textures/colors/white
 	color 1.00 1.00 1.00
-	environment sky
+	environment
 	bright
 }
 
@@ -32,14 +32,29 @@ textures/colors/red
 {
 	qer_editorimage textures/colors/red
 	color 1.00 0.00 0.00
-	environment sky
+	environment
 }
 
 textures/colors/red_bright
 {
 	qer_editorimage textures/colors/red
 	color 1.00 0.00 0.00
-	environment sky
+	environment
+	bright
+}
+
+textures/colors/orange
+{
+	qer_editorimage textures/colors/orange
+	color 1.00 0.50 0.00
+	environment
+}
+
+textures/colors/orange_bright
+{
+	qer_editorimage textures/colors/orange
+	color 1.00 0.50 0.00
+	environment
 	bright
 }
 
@@ -47,14 +62,29 @@ textures/colors/green
 {
 	qer_editorimage textures/colors/green
 	color 0.00 1.00 0.00
-	environment sky
+	environment
 }
 
 textures/colors/green_bright
 {
 	qer_editorimage textures/colors/green
 	color 0.00 1.00 0.00
-	environment sky
+	environment
+	bright
+}
+
+textures/colors/yellow
+{
+	qer_editorimage textures/colors/yellow
+	color 1.00 1.00 0.00
+	environment
+}
+
+textures/colors/yellow_bright
+{
+	qer_editorimage textures/colors/yellow
+	color 1.00 1.00 0.00
+	environment
 	bright
 }
 
@@ -62,14 +92,14 @@ textures/colors/blue
 {
 	qer_editorimage textures/colors/blue
 	color 0.00 0.00 1.00
-	environment sky
+	environment
 }
 
 textures/colors/blue_bright
 {
 	qer_editorimage textures/colors/blue
 	color 0.00 0.00 1.00
-	environment sky
+	environment
 	bright
 }
 
@@ -77,14 +107,14 @@ textures/colors/grey25
 {
 	qer_editorimage textures/colors/grey25
 	color 0.25 0.25 0.25
-	environment sky
+	environment
 }
 
 textures/colors/grey25_bright
 {
 	qer_editorimage textures/colors/grey25
 	color 0.25 0.25 0.25
-	environment sky
+	environment
 	bright
 }
 
@@ -92,14 +122,14 @@ textures/colors/grey50
 {
 	qer_editorimage textures/colors/grey50
 	color 0.50 0.50 0.50
-	environment sky
+	environment
 }
 
 textures/colors/grey50_bright
 {
 	qer_editorimage textures/colors/grey50
 	color 0.50 0.50 0.50
-	environment sky
+	environment
 	bright
 }
 
@@ -107,14 +137,14 @@ textures/colors/grey75
 {
 	qer_editorimage textures/colors/grey75
 	color 0.75 0.75 0.75
-	environment sky
+	environment
 }
 
 textures/colors/grey75_bright
 {
 	qer_editorimage textures/colors/grey75
 	color 0.75 0.75 0.75
-	environment sky
+	environment
 	bright
 }
 
@@ -122,13 +152,13 @@ textures/colors/grey90
 {
 	qer_editorimage textures/colors/grey90
 	color 0.90 0.90 0.90
-	environment sky
+	environment
 }
 
 textures/colors/grey90_bright
 {
 	qer_editorimage textures/colors/grey90
 	color 0.90 0.90 0.90
-	environment sky
+	environment
 	bright
 }
diff --git a/base/textures/colors/orange.tga b/base/textures/colors/orange.tga
new file mode 100644
index 0000000..24d14d9
Binary files /dev/null and b/base/textures/colors/orange.tga differ
diff --git a/base/textures/colors/yellow.tga b/base/textures/colors/yellow.tga
new file mode 100644
index 0000000..24c4c0a
Binary files /dev/null and b/base/textures/colors/yellow.tga differ
-- 
cgit v1.2.3