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>2012-01-21 03:20:49 +0000
committerEvan Goers <mega@osirion.org>2012-01-21 03:20:49 +0000
commit071180c0bcfe5e0ef6e3092e75b06c736107b7dd (patch)
treebc5b197f14ec02689576e258cca6ea96057e6a3c /base/materials
parentd397831cccee0943e375ab20a1f7e56d97d229aa (diff)
Various details.
Diffstat (limited to 'base/materials')
-rw-r--r--base/materials/colors.shader26
-rw-r--r--base/materials/detail.shader17
2 files changed, 17 insertions, 26 deletions
diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index a040f17..3cf319e 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -2,8 +2,6 @@ textures/colors/black
{
qer_editorimage textures/colors/black
color 0.00 0.00 0.00
- texture textures/fx/generic_env2
- environment
}
textures/colors/black_bright
@@ -17,8 +15,6 @@ textures/colors/white
{
qer_editorimage textures/colors/white
color 1.00 1.00 1.00
- texture textures/fx/generic_env2
- environment
}
textures/colors/white_bright
@@ -32,8 +28,6 @@ textures/colors/red
{
qer_editorimage textures/colors/red
color 1.00 0.00 0.00
- texture textures/fx/generic_env2
- environment
}
textures/colors/red_shiny
@@ -55,8 +49,6 @@ textures/colors/orange
{
qer_editorimage textures/colors/orange
color 1.00 0.50 0.00
- texture textures/fx/generic_env2
- environment
}
textures/colors/orange_shiny
@@ -78,8 +70,6 @@ textures/colors/green
{
qer_editorimage textures/colors/green
color 0.00 1.00 0.00
- texture textures/fx/generic_env2
- environment
}
textures/colors/green_shiny
@@ -101,8 +91,6 @@ textures/colors/yellow
{
qer_editorimage textures/colors/yellow
color 1.00 1.00 0.00
- texture textures/fx/generic_env2
- environment
}
textures/colors/yellow_shiny
@@ -124,8 +112,6 @@ textures/colors/blue
{
qer_editorimage textures/colors/blue
color 0.00 0.00 1.00
- texture textures/fx/generic_env2
- environment
}
textures/colors/blue_shiny
@@ -147,8 +133,6 @@ textures/colors/purple
{
qer_editorimage textures/colors/purple
color 0.50 0.00 0.50
- texture textures/fx/generic_env2
- environment
}
textures/colors/purple_shiny
@@ -163,8 +147,6 @@ textures/colors/purple_bright
{
qer_editorimage textures/colors/purple
color 0.50 0.00 0.50
- texture textures/fx/generic_env2
- environment
bright
}
@@ -172,8 +154,6 @@ textures/colors/grey25
{
qer_editorimage textures/colors/grey25
color 0.25 0.25 0.25
- texture textures/fx/generic_env2
- environment
}
textures/colors/grey25_shiny
@@ -195,8 +175,6 @@ textures/colors/grey50
{
qer_editorimage textures/colors/grey50
color 0.50 0.50 0.50
- texture textures/fx/generic_env2
- environment
}
textures/colors/grey50_shiny
@@ -218,8 +196,6 @@ textures/colors/grey75
{
qer_editorimage textures/colors/grey75
color 0.75 0.75 0.75
- texture textures/fx/generic_env2
- environment
}
textures/colors/grey75_shiny
@@ -241,8 +217,6 @@ textures/colors/grey90
{
qer_editorimage textures/colors/grey90
color 0.90 0.90 0.90
- texture textures/fx/generic_env2
- environment
}
textures/colors/grey90_shiny
diff --git a/base/materials/detail.shader b/base/materials/detail.shader
index 7dcc264..3e4b885 100644
--- a/base/materials/detail.shader
+++ b/base/materials/detail.shader
@@ -69,3 +69,20 @@ textures/detail/danger_entitysecond
color 1.00 1.00 1.00
entitySecond
}
+
+textures/detail/gatling
+{
+ qer_editorimage textures/detail/gatling
+ texture textures/detail/gatling_trans
+ color 1.00 1.00 1.00
+ bright
+ decal
+}
+
+textures/detail/shark_512
+{
+ qer_editorimage textures/detail/shark_512
+ texture textures/detail/shark_512
+ color 1.00 1.00 1.00
+ decal
+}