Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-12-21 15:56:04 +0000
committerStijn Buys <ingar@osirion.org>2010-12-21 15:56:04 +0000
commit75fae3cc30c8d969f620a19ce914c00d9646f902 (patch)
tree156cd5dd2c77c60ec2f13e6a563aab0d3980d87d /base
parenta75c704ad026ab9ae712c0543ee5ab8be1eb4372 (diff)
Removed common/hint material, added common/noclip, updated related textures.
Diffstat (limited to 'base')
-rw-r--r--base/materials/common.shader14
-rw-r--r--base/textures/common/engine.tgabin1810 -> 1868 bytes
-rw-r--r--base/textures/common/hint.tgabin1942 -> 0 bytes
-rw-r--r--base/textures/common/noclip.tgabin0 -> 1699 bytes
4 files changed, 8 insertions, 6 deletions
diff --git a/base/materials/common.shader b/base/materials/common.shader
index fb9099f..ee30bef 100644
--- a/base/materials/common.shader
+++ b/base/materials/common.shader
@@ -7,16 +7,21 @@ textures/common/caulk
textures/common/clip
{
qer_editorimage textures/common/clip.tga
- qer_trans 0.20
+ qer_trans 0.20
ignore
+ // make radiant recognize this material as clip. ignored by osirion
+ surfaceparm playerclip
}
-textures/common/hint
+textures/common/noclip
{
- qer_editorimage textures/common/hint.tga
+ qer_editorimage textures/common/noclip.tga
qer_trans 0.20
ignore
+ // make radiant recognize this material as clip. ignored by osirion
+ surfaceparm playerclip
}
+
textures/common/engine
{
qer_editorimage textures/common/engine.tga
@@ -24,7 +29,6 @@ textures/common/engine
bright
}
-// don't touch
textures/common/entity
{
qer_editorimage textures/common/entity.tga
@@ -49,7 +53,6 @@ textures/common/entity_bright
bright
}
-// don't touch
textures/common/entity_dark
{
qer_editorimage textures/common/entity_dark.tga
@@ -74,7 +77,6 @@ textures/common/entity_dark_bright
bright
}
-// don't touch
textures/common/entity_second
{
qer_editorimage textures/common/entity_second.tga
diff --git a/base/textures/common/engine.tga b/base/textures/common/engine.tga
index d72dc19..9b0c8e1 100644
--- a/base/textures/common/engine.tga
+++ b/base/textures/common/engine.tga
Binary files differ
diff --git a/base/textures/common/hint.tga b/base/textures/common/hint.tga
deleted file mode 100644
index 393d4fc..0000000
--- a/base/textures/common/hint.tga
+++ /dev/null
Binary files differ
diff --git a/base/textures/common/noclip.tga b/base/textures/common/noclip.tga
new file mode 100644
index 0000000..2a96635
--- /dev/null
+++ b/base/textures/common/noclip.tga
Binary files differ