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 21:42:45 +0000
committerEvan Goers <mega@osirion.org>2009-07-16 21:42:45 +0000
commit605e15904d44b2271f15b025fb7b51a836e0714f (patch)
tree2e60b4d579171db8cfdec6861a6fb18caa3b536a /base/maps/derelict
parent1d55636b8d72eaac496450dff52e3d9f5297afc8 (diff)
Added brown glass shader.
Updated lots of models for the new glass shaders.
Diffstat (limited to 'base/maps/derelict')
-rw-r--r--base/maps/derelict/ares.map16
-rw-r--r--base/maps/derelict/hades.map4
2 files changed, 10 insertions, 10 deletions
diff --git a/base/maps/derelict/ares.map b/base/maps/derelict/ares.map
index e4180e5..152b99e 100644
--- a/base/maps/derelict/ares.map
+++ b/base/maps/derelict/ares.map
@@ -902,7 +902,7 @@
}
// brush 88
{
-( 3552 360 2672 ) ( 3552 -360 2672 ) ( 3552 -360 2912 ) common/entity_bright 0 0 0 1 1 0 1 0
+( 3552 360 2672 ) ( 3552 -360 2672 ) ( 3552 -360 2912 ) glass/entity 0 0 0 1 1 0 1 0
( 2352 -360 2912 ) ( 2352 360 2552 ) ( 2352 360 2912 ) common/entity_second_dark 0 0 0 1 1
( 432 240 2852 ) ( 432 240 2792 ) ( 1392 240 2852 ) common/caulk 0 0 0 1 1
( 1392 -240 2852 ) ( 432 -240 2732 ) ( 432 -240 2852 ) common/caulk 0 0 0 1 1
@@ -2445,7 +2445,7 @@
{
( 7168 512 576 ) ( 7168 448 576 ) ( 7152 512 576 ) common/caulk 0 0 0 1 1
( 7184 800 576 ) ( 7168 800 576 ) ( 7184 800 512 ) common/caulk 0 0 0 1 1
-( 7160 512 576 ) ( 7160 512 512 ) ( 7160 448 576 ) common/entity_bright 0 0 0 1 1
+( 7160 512 576 ) ( 7160 512 512 ) ( 7160 448 576 ) glass/entity 0 0 0 1 1
( 7152 448 512 ) ( 7168 448 512 ) ( 7152 512 512 ) common/caulk 0 0 0 1 1
( 7152 448 512 ) ( 7152 512 512 ) ( 7152 448 576 ) common/caulk 0 0 0 1 1
( 7152 -800 512 ) ( 7152 -800 576 ) ( 7168 -800 512 ) common/caulk 0 0 0 1 1
@@ -2517,7 +2517,7 @@
{
( 7168 512 2112 ) ( 7168 448 2112 ) ( 7152 512 2112 ) common/caulk 0 0 0 1 1
( 7184 800 2112 ) ( 7168 800 2112 ) ( 7184 800 2048 ) common/caulk 0 0 0 1 1
-( 7160 512 2112 ) ( 7160 512 2048 ) ( 7160 448 2112 ) common/entity_bright 0 0 0 1 1
+( 7160 512 2112 ) ( 7160 512 2048 ) ( 7160 448 2112 ) glass/entity 0 0 0 1 1
( 7152 448 2048 ) ( 7168 448 2048 ) ( 7152 512 2048 ) common/caulk 0 0 0 1 1
( 7152 448 2048 ) ( 7152 512 2048 ) ( 7152 448 2112 ) common/caulk 0 0 0 1 1
( 7152 -800 2048 ) ( 7152 -800 2112 ) ( 7168 -800 2048 ) common/caulk 0 0 0 1 1
@@ -2589,7 +2589,7 @@
{
( 7168 512 1856 ) ( 7168 448 1856 ) ( 7152 512 1856 ) common/caulk 0 0 0 1 1
( 7184 800 1856 ) ( 7168 800 1856 ) ( 7184 800 1792 ) common/caulk 0 0 0 1 1
-( 7160 512 1856 ) ( 7160 512 1792 ) ( 7160 448 1856 ) common/entity_bright 0 0 0 1 1
+( 7160 512 1856 ) ( 7160 512 1792 ) ( 7160 448 1856 ) glass/entity 0 0 0 1 1
( 7152 448 1792 ) ( 7168 448 1792 ) ( 7152 512 1792 ) common/caulk 0 0 0 1 1
( 7152 448 1792 ) ( 7152 512 1792 ) ( 7152 448 1856 ) common/caulk 0 0 0 1 1
( 7152 -800 1792 ) ( 7152 -800 1856 ) ( 7168 -800 1792 ) common/caulk 0 0 0 1 1
@@ -2661,7 +2661,7 @@
{
( 7168 512 1600 ) ( 7168 448 1600 ) ( 7152 512 1600 ) common/caulk 0 0 0 1 1
( 7184 800 1600 ) ( 7168 800 1600 ) ( 7184 800 1536 ) common/caulk 0 0 0 1 1
-( 7160 512 1600 ) ( 7160 512 1536 ) ( 7160 448 1600 ) common/entity_bright 0 0 0 1 1
+( 7160 512 1600 ) ( 7160 512 1536 ) ( 7160 448 1600 ) glass/entity 0 0 0 1 1
( 7152 448 1536 ) ( 7168 448 1536 ) ( 7152 512 1536 ) common/caulk 0 0 0 1 1
( 7152 448 1536 ) ( 7152 512 1536 ) ( 7152 448 1600 ) common/caulk 0 0 0 1 1
( 7152 -800 1536 ) ( 7152 -800 1600 ) ( 7168 -800 1536 ) common/caulk 0 0 0 1 1
@@ -2733,7 +2733,7 @@
{
( 7168 512 1344 ) ( 7168 448 1344 ) ( 7152 512 1344 ) common/caulk 0 0 0 1 1
( 7184 800 1344 ) ( 7168 800 1344 ) ( 7184 800 1280 ) common/caulk 0 0 0 1 1
-( 7160 512 1344 ) ( 7160 512 1280 ) ( 7160 448 1344 ) common/entity_bright 0 0 0 1 1
+( 7160 512 1344 ) ( 7160 512 1280 ) ( 7160 448 1344 ) glass/entity 0 0 0 1 1
( 7152 448 1280 ) ( 7168 448 1280 ) ( 7152 512 1280 ) common/caulk 0 0 0 1 1
( 7152 448 1280 ) ( 7152 512 1280 ) ( 7152 448 1344 ) common/caulk 0 0 0 1 1
( 7152 -800 1280 ) ( 7152 -800 1344 ) ( 7168 -800 1280 ) common/caulk 0 0 0 1 1
@@ -2805,7 +2805,7 @@
{
( 7168 512 1088 ) ( 7168 448 1088 ) ( 7152 512 1088 ) common/caulk 0 0 0 1 1
( 7184 800 1088 ) ( 7168 800 1088 ) ( 7184 800 1024 ) common/caulk 0 0 0 1 1
-( 7160 512 1088 ) ( 7160 512 1024 ) ( 7160 448 1088 ) common/entity_bright 0 0 0 1 1
+( 7160 512 1088 ) ( 7160 512 1024 ) ( 7160 448 1088 ) glass/entity 0 0 0 1 1
( 7152 448 1024 ) ( 7168 448 1024 ) ( 7152 512 1024 ) common/caulk 0 0 0 1 1
( 7152 448 1024 ) ( 7152 512 1024 ) ( 7152 448 1088 ) common/caulk 0 0 0 1 1
( 7152 -800 1024 ) ( 7152 -800 1088 ) ( 7168 -800 1024 ) common/caulk 0 0 0 1 1
@@ -2877,7 +2877,7 @@
{
( 7168 512 832 ) ( 7168 448 832 ) ( 7152 512 832 ) common/caulk 0 0 0 1 1
( 7184 800 832 ) ( 7168 800 832 ) ( 7184 800 768 ) common/caulk 0 0 0 1 1
-( 7160 512 832 ) ( 7160 512 768 ) ( 7160 448 832 ) common/entity_bright 0 0 0 1 1
+( 7160 512 832 ) ( 7160 512 768 ) ( 7160 448 832 ) glass/entity 0 0 0 1 1
( 7152 448 768 ) ( 7168 448 768 ) ( 7152 512 768 ) common/caulk 0 0 0 1 1
( 7152 448 768 ) ( 7152 512 768 ) ( 7152 448 832 ) common/caulk 0 0 0 1 1
( 7152 -800 768 ) ( 7152 -800 832 ) ( 7168 -800 768 ) common/caulk 0 0 0 1 1
diff --git a/base/maps/derelict/hades.map b/base/maps/derelict/hades.map
index 71b8682..141d9c7 100644
--- a/base/maps/derelict/hades.map
+++ b/base/maps/derelict/hades.map
@@ -2503,7 +2503,7 @@
}
// brush 265
{
-( -912 640 1536 ) ( -832 640 1456 ) ( -912 -640 1536 ) common/entity_bright 0 0 0 1 1 0 1 0
+( -912 640 1536 ) ( -832 640 1456 ) ( -912 -640 1536 ) glass/entity 0 0 0 1 1 0 1 0
( -64 96 1504 ) ( -64 128 1504 ) ( 64 96 1504 ) common/caulk 0 0 0 1 1
( 64 -64 1504 ) ( -64 -64 1472 ) ( -64 -64 1504 ) common/caulk 0 0 0 1 1
( -64 64 1504 ) ( -64 64 1472 ) ( 64 64 1504 ) common/caulk 0 0 0 1 1
@@ -2521,7 +2521,7 @@
}
// brush 267
{
-( -944 256 1568 ) ( -880 -256 1504 ) ( -944 -256 1568 ) common/entity_bright 0 0 0 1 1 0 1 0
+( -944 256 1568 ) ( -880 -256 1504 ) ( -944 -256 1568 ) glass/entity 0 0 0 1 1 0 1 0
( -64 128 1568 ) ( -64 160 1568 ) ( 64 128 1568 ) common/caulk 0 0 0 1 1
( -880 256 1504 ) ( -4352 -256 1504 ) ( -880 -256 1504 ) common/caulk 0 0 0 1 1
( -2432 2072 64 ) ( -2432 2064 -64 ) ( -2432 2072 -64 ) common/caulk 0 0 0 1 1