Merge remote branch 'origin/master' into diabolik/facility114-team

diff --git a/scripts/facility114x.shader b/scripts/facility114x.shader
index 081ed8e6683d2a65a9c2ce4a2bf2f6b6b0f324ad..6b49713f91525da123a74650920c708df95019e7 100644 (file)
--- a/scripts/facility114x.shader
+++ b/scripts/facility114x.shader
@@ -104,6 +104,44 @@ textures/facility114x/ceiling-ceiling00
                map textures/facility114x/ceiling/ceiling00.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/ceiling-ceiling00b
+{
+       qer_editorimage textures/facility114x/ceiling/ceiling00b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/ceiling/ceiling00b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/ceiling-ceiling00r
+{
+       qer_editorimage textures/facility114x/ceiling/ceiling00r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/ceiling/ceiling00r.tga
+               
+
        }
        {
                map $lightmap
@@ -123,6 +161,44 @@ textures/facility114x/ceiling-ceiling01
                map textures/facility114x/ceiling/ceiling01.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/ceiling-ceiling01b
+{
+       qer_editorimage textures/facility114x/ceiling/ceiling01b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/ceiling/ceiling01b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/ceiling-ceiling01r
+{
+       qer_editorimage textures/facility114x/ceiling/ceiling01r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/ceiling/ceiling01r.tga
+               
+
        }
        {
                map $lightmap
@@ -218,6 +294,44 @@ textures/facility114x/misc-lift00
                map textures/facility114x/misc/lift00.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/misc-lift00b
+{
+       qer_editorimage textures/facility114x/misc/lift00b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/misc/lift00b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/misc-lift00r
+{
+       qer_editorimage textures/facility114x/misc/lift00r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/misc/lift00r.tga
+               
+
        }
        {
                map $lightmap
@@ -237,6 +351,44 @@ textures/facility114x/misc-lift01
                map textures/facility114x/misc/lift01.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/misc-lift01b
+{
+       qer_editorimage textures/facility114x/misc/lift01b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/misc/lift01b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/misc-lift01r
+{
+       qer_editorimage textures/facility114x/misc/lift01r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/misc/lift01r.tga
+               
+
        }
        {
                map $lightmap
@@ -256,6 +408,44 @@ textures/facility114x/misc-lift02
                map textures/facility114x/misc/lift02.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/misc-lift02b
+{
+       qer_editorimage textures/facility114x/misc/lift02b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/misc/lift02b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/misc-lift02r
+{
+       qer_editorimage textures/facility114x/misc/lift02r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/misc/lift02r.tga
+               
+
        }
        {
                map $lightmap
@@ -313,6 +503,44 @@ textures/facility114x/trim-trim01
                map textures/facility114x/trim/trim01.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/trim-trim01b
+{
+       qer_editorimage textures/facility114x/trim/trim01b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/trim/trim01b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/trim-trim01r
+{
+       qer_editorimage textures/facility114x/trim/trim01r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/trim/trim01r.tga
+               
+
        }
        {
                map $lightmap
@@ -351,6 +579,44 @@ textures/facility114x/wall-corridor00
                map textures/facility114x/wall/corridor00.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/wall-corridor00b
+{
+       qer_editorimage textures/facility114x/wall/corridor00b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/wall/corridor00b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/wall-corridor00r
+{
+       qer_editorimage textures/facility114x/wall/corridor00r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/wall/corridor00r.tga
+               
+
        }
        {
                map $lightmap
@@ -370,6 +636,44 @@ textures/facility114x/wall-corridor01
                map textures/facility114x/wall/corridor01.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/wall-corridor01b
+{
+       qer_editorimage textures/facility114x/wall/corridor01b.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/wall/corridor01b.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114x/wall-corridor01r
+{
+       qer_editorimage textures/facility114x/wall/corridor01r.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114x/wall/corridor01r.tga
+               
+
        }
        {
                map $lightmap

diff --git a/textures/facility114x/ceiling/ceiling00b.tga b/textures/facility114x/ceiling/ceiling00b.tga
new file mode 100644 (file)
index 0000000..31b814b
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling00b.tga differ

diff --git a/textures/facility114x/ceiling/ceiling00b_gloss.tga b/textures/facility114x/ceiling/ceiling00b_gloss.tga
new file mode 100644 (file)
index 0000000..6f7d6a6
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling00b_gloss.tga differ

diff --git a/textures/facility114x/ceiling/ceiling00b_norm.tga b/textures/facility114x/ceiling/ceiling00b_norm.tga
new file mode 100644 (file)
index 0000000..7b6d48d
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling00b_norm.tga differ

diff --git a/textures/facility114x/ceiling/ceiling00r.tga b/textures/facility114x/ceiling/ceiling00r.tga
new file mode 100644 (file)
index 0000000..519dbfa
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling00r.tga differ

diff --git a/textures/facility114x/ceiling/ceiling00r_gloss.tga b/textures/facility114x/ceiling/ceiling00r_gloss.tga
new file mode 100644 (file)
index 0000000..de0556f
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling00r_gloss.tga differ

diff --git a/textures/facility114x/ceiling/ceiling00r_norm.tga b/textures/facility114x/ceiling/ceiling00r_norm.tga
new file mode 100644 (file)
index 0000000..7b6d48d
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling00r_norm.tga differ

diff --git a/textures/facility114x/ceiling/ceiling01b.tga b/textures/facility114x/ceiling/ceiling01b.tga
new file mode 100644 (file)
index 0000000..f0a0cd2
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling01b.tga differ

diff --git a/textures/facility114x/ceiling/ceiling01b_gloss.tga b/textures/facility114x/ceiling/ceiling01b_gloss.tga
new file mode 100644 (file)
index 0000000..e742338
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling01b_gloss.tga differ

diff --git a/textures/facility114x/ceiling/ceiling01b_norm.tga b/textures/facility114x/ceiling/ceiling01b_norm.tga
new file mode 100644 (file)
index 0000000..40913bb
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling01b_norm.tga differ

diff --git a/textures/facility114x/ceiling/ceiling01r.tga b/textures/facility114x/ceiling/ceiling01r.tga
new file mode 100644 (file)
index 0000000..914ce23
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling01r.tga differ

diff --git a/textures/facility114x/ceiling/ceiling01r_gloss.tga b/textures/facility114x/ceiling/ceiling01r_gloss.tga
new file mode 100644 (file)
index 0000000..adf5532
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling01r_gloss.tga differ

diff --git a/textures/facility114x/ceiling/ceiling01r_norm.tga b/textures/facility114x/ceiling/ceiling01r_norm.tga
new file mode 100644 (file)
index 0000000..40913bb
Binary files /dev/null and b/textures/facility114x/ceiling/ceiling01r_norm.tga differ

diff --git a/textures/facility114x/misc/lift00b.tga b/textures/facility114x/misc/lift00b.tga
new file mode 100644 (file)
index 0000000..ca4bc33
Binary files /dev/null and b/textures/facility114x/misc/lift00b.tga differ

diff --git a/textures/facility114x/misc/lift00b_gloss.tga b/textures/facility114x/misc/lift00b_gloss.tga
new file mode 100644 (file)
index 0000000..687dcf2
Binary files /dev/null and b/textures/facility114x/misc/lift00b_gloss.tga differ

diff --git a/textures/facility114x/misc/lift00b_norm.tga b/textures/facility114x/misc/lift00b_norm.tga
new file mode 100644 (file)
index 0000000..d138e61
Binary files /dev/null and b/textures/facility114x/misc/lift00b_norm.tga differ

diff --git a/textures/facility114x/misc/lift00r.tga b/textures/facility114x/misc/lift00r.tga
new file mode 100644 (file)
index 0000000..1e94f7e
Binary files /dev/null and b/textures/facility114x/misc/lift00r.tga differ

diff --git a/textures/facility114x/misc/lift00r_gloss.tga b/textures/facility114x/misc/lift00r_gloss.tga
new file mode 100644 (file)
index 0000000..b790999
Binary files /dev/null and b/textures/facility114x/misc/lift00r_gloss.tga differ

diff --git a/textures/facility114x/misc/lift00r_norm.tga b/textures/facility114x/misc/lift00r_norm.tga
new file mode 100644 (file)
index 0000000..d138e61
Binary files /dev/null and b/textures/facility114x/misc/lift00r_norm.tga differ

diff --git a/textures/facility114x/misc/lift01b.tga b/textures/facility114x/misc/lift01b.tga
new file mode 100644 (file)
index 0000000..a01b1fe
Binary files /dev/null and b/textures/facility114x/misc/lift01b.tga differ

diff --git a/textures/facility114x/misc/lift01b_gloss.tga b/textures/facility114x/misc/lift01b_gloss.tga
new file mode 100644 (file)
index 0000000..d23ea97
Binary files /dev/null and b/textures/facility114x/misc/lift01b_gloss.tga differ

diff --git a/textures/facility114x/misc/lift01b_norm.tga b/textures/facility114x/misc/lift01b_norm.tga
new file mode 100644 (file)
index 0000000..3bc4d7c
Binary files /dev/null and b/textures/facility114x/misc/lift01b_norm.tga differ

diff --git a/textures/facility114x/misc/lift01r.tga b/textures/facility114x/misc/lift01r.tga
new file mode 100644 (file)
index 0000000..3ced47a
Binary files /dev/null and b/textures/facility114x/misc/lift01r.tga differ

diff --git a/textures/facility114x/misc/lift01r_gloss.tga b/textures/facility114x/misc/lift01r_gloss.tga
new file mode 100644 (file)
index 0000000..521f460
Binary files /dev/null and b/textures/facility114x/misc/lift01r_gloss.tga differ

diff --git a/textures/facility114x/misc/lift01r_norm.tga b/textures/facility114x/misc/lift01r_norm.tga
new file mode 100644 (file)
index 0000000..3bc4d7c
Binary files /dev/null and b/textures/facility114x/misc/lift01r_norm.tga differ

diff --git a/textures/facility114x/misc/lift02b.tga b/textures/facility114x/misc/lift02b.tga
new file mode 100644 (file)
index 0000000..5c76517
Binary files /dev/null and b/textures/facility114x/misc/lift02b.tga differ

diff --git a/textures/facility114x/misc/lift02b_gloss.tga b/textures/facility114x/misc/lift02b_gloss.tga
new file mode 100644 (file)
index 0000000..3c014a8
Binary files /dev/null and b/textures/facility114x/misc/lift02b_gloss.tga differ

diff --git a/textures/facility114x/misc/lift02b_norm.tga b/textures/facility114x/misc/lift02b_norm.tga
new file mode 100644 (file)
index 0000000..de85c54
Binary files /dev/null and b/textures/facility114x/misc/lift02b_norm.tga differ

diff --git a/textures/facility114x/misc/lift02r.tga b/textures/facility114x/misc/lift02r.tga
new file mode 100644 (file)
index 0000000..6e833b4
Binary files /dev/null and b/textures/facility114x/misc/lift02r.tga differ

diff --git a/textures/facility114x/misc/lift02r_gloss.tga b/textures/facility114x/misc/lift02r_gloss.tga
new file mode 100644 (file)
index 0000000..edc706f
Binary files /dev/null and b/textures/facility114x/misc/lift02r_gloss.tga differ

diff --git a/textures/facility114x/misc/lift02r_norm.tga b/textures/facility114x/misc/lift02r_norm.tga
new file mode 100644 (file)
index 0000000..de85c54
Binary files /dev/null and b/textures/facility114x/misc/lift02r_norm.tga differ

diff --git a/textures/facility114x/trim/trim01b.tga b/textures/facility114x/trim/trim01b.tga
new file mode 100644 (file)
index 0000000..5a8944b
Binary files /dev/null and b/textures/facility114x/trim/trim01b.tga differ

diff --git a/textures/facility114x/trim/trim01b_gloss.tga b/textures/facility114x/trim/trim01b_gloss.tga
new file mode 100644 (file)
index 0000000..2e11004
Binary files /dev/null and b/textures/facility114x/trim/trim01b_gloss.tga differ

diff --git a/textures/facility114x/trim/trim01b_norm.tga b/textures/facility114x/trim/trim01b_norm.tga
new file mode 100644 (file)
index 0000000..7806481
Binary files /dev/null and b/textures/facility114x/trim/trim01b_norm.tga differ

diff --git a/textures/facility114x/trim/trim01r.tga b/textures/facility114x/trim/trim01r.tga
new file mode 100644 (file)
index 0000000..1552700
Binary files /dev/null and b/textures/facility114x/trim/trim01r.tga differ

diff --git a/textures/facility114x/trim/trim01r_gloss.tga b/textures/facility114x/trim/trim01r_gloss.tga
new file mode 100644 (file)
index 0000000..eb674ad
Binary files /dev/null and b/textures/facility114x/trim/trim01r_gloss.tga differ

diff --git a/textures/facility114x/trim/trim01r_norm.tga b/textures/facility114x/trim/trim01r_norm.tga
new file mode 100644 (file)
index 0000000..7806481
Binary files /dev/null and b/textures/facility114x/trim/trim01r_norm.tga differ

diff --git a/textures/facility114x/wall/corridor00b.tga b/textures/facility114x/wall/corridor00b.tga
new file mode 100644 (file)
index 0000000..0363fd1
Binary files /dev/null and b/textures/facility114x/wall/corridor00b.tga differ

diff --git a/textures/facility114x/wall/corridor00b_gloss.tga b/textures/facility114x/wall/corridor00b_gloss.tga
new file mode 100644 (file)
index 0000000..baabcd3
Binary files /dev/null and b/textures/facility114x/wall/corridor00b_gloss.tga differ

diff --git a/textures/facility114x/wall/corridor00b_norm.tga b/textures/facility114x/wall/corridor00b_norm.tga
new file mode 100644 (file)
index 0000000..f11faf8
Binary files /dev/null and b/textures/facility114x/wall/corridor00b_norm.tga differ

diff --git a/textures/facility114x/wall/corridor00r.tga b/textures/facility114x/wall/corridor00r.tga
new file mode 100644 (file)
index 0000000..837e046
Binary files /dev/null and b/textures/facility114x/wall/corridor00r.tga differ

diff --git a/textures/facility114x/wall/corridor00r_gloss.tga b/textures/facility114x/wall/corridor00r_gloss.tga
new file mode 100644 (file)
index 0000000..7fc257f
Binary files /dev/null and b/textures/facility114x/wall/corridor00r_gloss.tga differ

diff --git a/textures/facility114x/wall/corridor00r_norm.tga b/textures/facility114x/wall/corridor00r_norm.tga
new file mode 100644 (file)
index 0000000..f11faf8
Binary files /dev/null and b/textures/facility114x/wall/corridor00r_norm.tga differ

diff --git a/textures/facility114x/wall/corridor01b.tga b/textures/facility114x/wall/corridor01b.tga
new file mode 100644 (file)
index 0000000..5afdf37
Binary files /dev/null and b/textures/facility114x/wall/corridor01b.tga differ

diff --git a/textures/facility114x/wall/corridor01b_gloss.tga b/textures/facility114x/wall/corridor01b_gloss.tga
new file mode 100644 (file)
index 0000000..149aaf0
Binary files /dev/null and b/textures/facility114x/wall/corridor01b_gloss.tga differ

diff --git a/textures/facility114x/wall/corridor01b_norm.tga b/textures/facility114x/wall/corridor01b_norm.tga
new file mode 100644 (file)
index 0000000..c1be2be
Binary files /dev/null and b/textures/facility114x/wall/corridor01b_norm.tga differ

diff --git a/textures/facility114x/wall/corridor01r.tga b/textures/facility114x/wall/corridor01r.tga
new file mode 100644 (file)
index 0000000..1190a48
Binary files /dev/null and b/textures/facility114x/wall/corridor01r.tga differ

diff --git a/textures/facility114x/wall/corridor01r_gloss.tga b/textures/facility114x/wall/corridor01r_gloss.tga
new file mode 100644 (file)
index 0000000..0f0efa7
Binary files /dev/null and b/textures/facility114x/wall/corridor01r_gloss.tga differ

diff --git a/textures/facility114x/wall/corridor01r_norm.tga b/textures/facility114x/wall/corridor01r_norm.tga
new file mode 100644 (file)
index 0000000..c1be2be
Binary files /dev/null and b/textures/facility114x/wall/corridor01r_norm.tga differ