Changed osirion.game to be more generic.

Updated pod, hades, researchstation, jupiter for new materials.
Fixed colors.shader, common.shader.

2 files changed, 29 insertions, 29 deletions

diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index cfc7701..1c9077c 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -15,14 +15,14 @@ textures/colors/black_bright
 
 textures/colors/white
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/white
 	color 1.00 1.00 1.00
 	environment sky
 }
 
 textures/colors/white_bright
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/white
 	color 1.00 1.00 1.00
 	environment sky
 	bright
@@ -30,14 +30,14 @@ textures/colors/white_bright
 
 textures/colors/green
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/green
 	color 1.00 0.00 0.00
 	environment sky
 }
 
 textures/colors/green_bright
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/green
 	color 1.00 0.00 0.00
 	environment sky
 	bright
@@ -45,14 +45,14 @@ textures/colors/green_bright
 
 textures/colors/blue
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/blue
 	color 0.00 0.00 1.00
 	environment sky
 }
 
 textures/colors/blue_bright
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/blue
 	color 0.00 0.00 1.00
 	environment sky
 	bright
@@ -60,14 +60,14 @@ textures/colors/blue_bright
 
 textures/colors/grey25
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey25
 	color 0.25 0.25 0.25
 	environment sky
 }
 
 textures/colors/grey25_bright
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey25
 	color 0.25 0.25 0.25
 	environment sky
 	bright
@@ -75,14 +75,14 @@ textures/colors/grey25_bright
 
 textures/colors/grey50
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey50
 	color 0.50 0.50 0.50
 	environment sky
 }
 
 textures/colors/grey50_bright
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey50
 	color 0.50 0.50 0.50
 	environment sky
 	bright
@@ -90,14 +90,14 @@ textures/colors/grey50_bright
 
 textures/colors/grey75
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey75
 	color 0.75 0.75 0.75
 	environment sky
 }
 
 textures/colors/grey75_bright
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey75
 	color 0.75 0.75 0.75
 	environment sky
 	bright
@@ -105,14 +105,14 @@ textures/colors/grey75_bright
 
 textures/colors/grey90
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey90
 	color 0.90 0.90 0.90
 	environment sky
 }
 
 textures/colors/grey90_bright
 {
-	qer_editorimage textures/colors/black
+	qer_editorimage textures/colors/grey90
 	color 0.90 0.90 0.90
 	environment sky
 	bright
diff --git a/base/materials/common.shader b/base/materials/common.shader
index 117c4c2..d10eb68 100644
--- a/base/materials/common.shader
+++ b/base/materials/common.shader
@@ -1,31 +1,31 @@
 textures/common/clip

 {
-	qer_editorimage textures/common/clip

+	qer_editorimage textures/common/clip.tga

 	qer_trans 0.20

 }

 

 textures/common/hint

 {
-	qer_editorimage textures/common/hint

+	qer_editorimage textures/common/hint.tga

 	qer_trans 0.20

 }

 textures/common/engine

 {

-	qer_editorimage textures/common/engine
+	qer_editorimage textures/common/engine.tga
 	engine
 	bright

 }
 
 textures/common/entity

 {

-	qer_editorimage textures/common/entity
+	qer_editorimage textures/common/entity.tga
 	entity
 	color 1.00 1.00 1.00

 }
 
 textures/common/entity_bright

 {

-	qer_editorimage textures/common/entity
+	qer_editorimage textures/common/entity.tga
 	entity
 	color 1.00 1.00 1.00
 	bright

@@ -33,14 +33,14 @@ textures/common/entity_bright
 
 textures/common/entity_dark

 {

-	qer_editorimage textures/common/entity_dark
+	qer_editorimage textures/common/entity_dark.tga
 	entity
 	color 0.50 0.50 0.50

 }
 
 textures/common/entity_dark_bright

 {

-	qer_editorimage textures/common/entity_dark
+	qer_editorimage textures/common/entity_dark.tga
 	entity
 	color 0.50 0.50 0.50
 	bright

@@ -48,14 +48,14 @@ textures/common/entity_dark_bright
 
 textures/common/entity_second

 {

-	qer_editorimage textures/common/entity_second
+	qer_editorimage textures/common/entity_second.tga
 	entitySecond
 	color 1.00 1.00 1.00

 }
 
 textures/common/entity_second_bright

 {

-	qer_editorimage textures/common/entity_second
+	qer_editorimage textures/common/entity_second.tga
 	entitySecond
 	color 1.00 1.00 1.00
 	bright

@@ -63,14 +63,14 @@ textures/common/entity_second_bright
 
 textures/common/entity_second_dark

 {

-	qer_editorimage textures/common/entity_second_dark
+	qer_editorimage textures/common/entity_second_dark.tga
 	entitySecond
 	color 0.50 0.50 0.50

 }
 
 textures/common/entity_second_dark_bright

 {

-	qer_editorimage textures/common/entity_second_dark
+	qer_editorimage textures/common/entity_second_dark.tga
 	entitySecond
 	color 0.50 0.50 0.50
 	bright

@@ -78,14 +78,14 @@ textures/common/entity_second_dark_bright
 
 textures/common/entity_third

 {

-	qer_editorimage textures/common/entity_third
+	qer_editorimage textures/common/entity_third.tga
 	entityThird
 	color 1.00 1.00 1.00

 }
 
 textures/common/entity_third_bright

 {

-	qer_editorimage textures/common/entity_third
+	qer_editorimage textures/common/entity_third.tga
 	entityThird
 	color 1.00 1.00 1.00
 	bright

@@ -93,14 +93,14 @@ textures/common/entity_third_bright
 
 textures/common/entity_third_dark

 {

-	qer_editorimage textures/common/entity_third_dark
+	qer_editorimage textures/common/entity_third_dark.tga
 	entityThird
 	color 0.50 0.50 0.50

 }
 
 textures/common/entity_third_dark_bright

 {

-	qer_editorimage textures/common/entity_third_dark
+	qer_editorimage textures/common/entity_third_dark.tga
 	entityThird
 	color 0.50 0.50 0.50
 	bright