Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2009-07-16 19:32:56 +0000
committerEvan Goers <mega@osirion.org>2009-07-16 19:32:56 +0000
commite932ba539ab29e8ecb3838a8658243480608bbcf (patch)
tree2d858e8cd1cb6fe1e7d24473eb82c80b050346e0
parent5378e90358c705d3377852e8a77725d135046b95 (diff)
Added yellow, orange colors.
-rw-r--r--base/materials/colors.shader66
-rw-r--r--base/textures/colors/orange.tgabin0 -> 364 bytes
-rw-r--r--base/textures/colors/yellow.tgabin0 -> 364 bytes
3 files changed, 48 insertions, 18 deletions
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
--- /dev/null
+++ b/base/textures/colors/orange.tga
Binary files differ
diff --git a/base/textures/colors/yellow.tga b/base/textures/colors/yellow.tga
new file mode 100644
index 0000000..24c4c0a
--- /dev/null
+++ b/base/textures/colors/yellow.tga
Binary files differ