Squashed commit of the following:

commit cc4b5ab2428b284ff03a8c84ed0c7345f3b22902
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:07:28 2010 +0100

    for X in */*_bump.tga; do echo "$X"; ~/Games/Xonotic/misc/tools/fft-normalmap-to-heightmap "$X" "${X%_bump.tga}_norm.tga" scharr3 -6 2; done

commit 1e3a70e7752a9ac590150369c3e35eb064555269
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:06:57 2010 +0100

    fix a bump file format

commit bc4b77b9cfb123e0aed5e0fd6de91c9d9143cded
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:02:35 2010 +0100

    fix more of the mess

commit 1d8a972861b9062f876fa6403d54af8c28269b17
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:00:16 2010 +0100

    another buggy texture fixed

commit 1c77b1bb56703ff39ea79c82988f149e084062f5
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:29:59 2010 +0100

    fix my last fix

commit b5f6c34ad071856251149b4429bb44ae3f929d18
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:23:51 2010 +0100

    light_1: fix too

commit 907aa89cc4e601c10796f1787e168834ebe96c31
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:18:38 2010 +0100

    delete some really hard to fix ex2x textures (no map in master uses these)

commit a49cd504db8132eb11c5c300cfaeb58f79091ca7
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:09:51 2010 +0100

    more fixed bumps

commit c27ff2298415a924034462468ba94178f9b09697
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 16:59:19 2010 +0100

    fix some more textures

commit 07edb984986ab6d6b32ca7bb0c33c40238d4cf4c
Merge: c8ebdfb 7bdcba4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 16:49:05 2010 +0100

    Merge remote branch 'origin/fruitiex/stormkeep' into divVerent/ex2x-fixes23

commit c8ebdfb80807ef02a504f651a46aa6c1a211d554
Merge: 696b07c 5b0b940
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 16:46:43 2010 +0100

    Merge branch 'master' into divVerent/ex2x-fixes23

commit 696b07c188109b3e341c34837b88f7508652f108
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:49:17 2010 +0200

    wall_purple1

commit 181b58e3443dd4c1b46f35b7bab7f510ce286bc6
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:46:22 2010 +0200

    trims too

commit e08c858c41dc01e37bd3f73ef2955ebc2a88367e
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:35:17 2010 +0200

    improve the metal3 bump

commit 57cfdb891e9b565a5fb0e06a71468f50df0f264a
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:25:07 2010 +0200

    remove the _norms that are borked anyway

commit 5ac190a08e880059bab20ccb127b4379bce4d93f
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:19:28 2010 +0200

    base_stone_metal

commit d304c4ac2007bd6e9cfa5a2d174bcd171e9b507c
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:17:10 2010 +0200

    more new bumps

commit e1a5a4d83e4a38b7c095fafd266815963e808166
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:01:41 2010 +0200

    base_metal2

commit c4e9671cc55054d34bc8225debae3589fea8b63d
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 10:45:35 2010 +0200

    metalmaterial

commit 67bbdfab5eabf71e61ce90839aa34efe1b7819ca
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 10:41:19 2010 +0200

    some first bumpmaps generated "properly"

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
index 9de868cd2eeb335f132d5aa82cb910de48ed54c7..0de893dad598b469048a44449e75d1237555c81c 100644 (file)
--- a/scripts/ex2x.shader
+++ b/scripts/ex2x.shader
@@ -299,50 +299,6 @@ textures/ex2x/floor-h4
                map textures/ex2x/floor/floor_h4.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-metal1
-{
-       qer_editorimage textures/ex2x/floor/floor_metal1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_metal1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-metal2
-{
-       qer_editorimage textures/ex2x/floor/floor_metal2.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_metal2.tga
-               
-
        }
        {
                map $lightmap
@@ -365,28 +321,6 @@ textures/ex2x/floor-metal3
                map textures/ex2x/floor/floor_metal3.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-p1
-{
-       qer_editorimage textures/ex2x/floor/floor_p1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_p1.tga
-               
-
        }
        {
                map $lightmap
@@ -439,51 +373,7 @@ textures/ex2x/floor-plate2
                blendfunc filter
        }
 }
-textures/ex2x/floor-r1
-{
-       qer_editorimage textures/ex2x/floor/floor_r1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_r1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-rust1
-{
-       qer_editorimage textures/ex2x/floor/floor_rust1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_rust1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/light-1
+extures/ex2x/light-1
 {
        qer_editorimage textures/ex2x/light/light_1.tga
        
@@ -497,28 +387,6 @@ textures/ex2x/light-1
                map textures/ex2x/light/light_1.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/light-2
-{
-       qer_editorimage textures/ex2x/light/light_2.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/light/light_2.tga
-               
-
        }
        {
                map $lightmap
@@ -609,50 +477,6 @@ textures/ex2x/trim-warn1
                map textures/ex2x/trim/trim_warn1.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/wall-green1
-{
-       qer_editorimage textures/ex2x/wall/wall_green1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/wall/wall_green1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/wall-green1dirt
-{
-       qer_editorimage textures/ex2x/wall/wall_green1dirt.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/wall/wall_green1dirt.tga
-               
-
        }
        {
                map $lightmap

diff --git a/textures/ex2x/base/base_bluepaint_norm.tga b/textures/ex2x/base/base_bluepaint_norm.tga
index 1327878db686d26385800c85f6550d4c6ff35bbb..8b6458114833aa7d4b2aa1b5ee865717899f5fc0 100644 (file)
Binary files a/textures/ex2x/base/base_bluepaint_norm.tga and b/textures/ex2x/base/base_bluepaint_norm.tga differ

diff --git a/textures/ex2x/base/base_chainlink_norm.tga b/textures/ex2x/base/base_chainlink_norm.tga
index ee5d8aefe398f14f9e4e446ea9daadd9260b5af5..6d15a72315007b3790f8f5d65c6fc30826862f30 100644 (file)
Binary files a/textures/ex2x/base/base_chainlink_norm.tga and b/textures/ex2x/base/base_chainlink_norm.tga differ

diff --git a/textures/ex2x/base/base_metal1_norm.tga b/textures/ex2x/base/base_metal1_norm.tga
index 589e4543a2f4b7c71fb9eb1f543019874d9bd12d..e172b103bd42541534211771c266cbb16d1d3c27 100644 (file)
Binary files a/textures/ex2x/base/base_metal1_norm.tga and b/textures/ex2x/base/base_metal1_norm.tga differ

diff --git a/textures/ex2x/base/base_metal2_norm.tga b/textures/ex2x/base/base_metal2_norm.tga
index 8e37f9ab5747f3229b830978b9265d374f86b183..9d68a6241cef1c4e97159ee11d193a54f9b9b10f 100644 (file)
Binary files a/textures/ex2x/base/base_metal2_norm.tga and b/textures/ex2x/base/base_metal2_norm.tga differ

diff --git a/textures/ex2x/base/base_metal3_norm.tga b/textures/ex2x/base/base_metal3_norm.tga
index 11780e3cfe7f679045fe03d085c24dbc5740b1e6..144ed7d890b0b5fcab12f4e0b596ba237139c7e3 100644 (file)
Binary files a/textures/ex2x/base/base_metal3_norm.tga and b/textures/ex2x/base/base_metal3_norm.tga differ

diff --git a/textures/ex2x/base/base_metal4_norm.tga b/textures/ex2x/base/base_metal4_norm.tga
index f3f15a2b8f1f884c687e2c3c19790837df9adf1a..4835810e2a658ef1cc486901a30acfd99906dc8d 100644 (file)
Binary files a/textures/ex2x/base/base_metal4_norm.tga and b/textures/ex2x/base/base_metal4_norm.tga differ

diff --git a/textures/ex2x/base/base_metalmaterial1_norm.tga b/textures/ex2x/base/base_metalmaterial1_norm.tga
new file mode 100644 (file)
index 0000000..9cba270
Binary files /dev/null and b/textures/ex2x/base/base_metalmaterial1_norm.tga differ

diff --git a/textures/ex2x/base/base_stone_metal_norm.tga b/textures/ex2x/base/base_stone_metal_norm.tga
index 6524e1d5884fb3cd53d3d54b1704bea75f527c6b..8fdc356472939150737f7b24cb39259ff7a763fe 100644 (file)
Binary files a/textures/ex2x/base/base_stone_metal_norm.tga and b/textures/ex2x/base/base_stone_metal_norm.tga differ

diff --git a/textures/ex2x/base/base_yellowpaint_norm.tga b/textures/ex2x/base/base_yellowpaint_norm.tga
index 387378a8c4dd6d4b5fb5dbb2945bc98f2160cf1a..5d98ee5bd0bce3a328c05bc422d381070b8b0de7 100644 (file)
Binary files a/textures/ex2x/base/base_yellowpaint_norm.tga and b/textures/ex2x/base/base_yellowpaint_norm.tga differ

diff --git a/textures/ex2x/floor/floor_1_norm.tga b/textures/ex2x/floor/floor_1_norm.tga
index 4187af7c0894a7b15887f34bac01da9b6058f055..8d96634533e369a2d2eb034e319b48fceac97a16 100644 (file)
Binary files a/textures/ex2x/floor/floor_1_norm.tga and b/textures/ex2x/floor/floor_1_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h1_norm.tga b/textures/ex2x/floor/floor_h1_norm.tga
index 155959ee92c3b1af27eec6c5a2d6bbccc2ef3f0d..b0f3fccc97262ce7185dc98c0ed68f6822cf27b2 100644 (file)
Binary files a/textures/ex2x/floor/floor_h1_norm.tga and b/textures/ex2x/floor/floor_h1_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h2_norm.tga b/textures/ex2x/floor/floor_h2_norm.tga
index ce7e4e2aa4b5f5a9659985f0c9967d43ec283be5..0e590311103316720c31778124a4f8619cc0bc75 100644 (file)
Binary files a/textures/ex2x/floor/floor_h2_norm.tga and b/textures/ex2x/floor/floor_h2_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h3_norm.tga b/textures/ex2x/floor/floor_h3_norm.tga
index e91e1ae4af84d1219c513bb429a0232f0da51eec..4cb90d98e2bd0962ed3b095d8cf02cd1c9fb684b 100644 (file)
Binary files a/textures/ex2x/floor/floor_h3_norm.tga and b/textures/ex2x/floor/floor_h3_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h4_norm.tga b/textures/ex2x/floor/floor_h4_norm.tga
index 61d1f33fc25843515ed636bca4e493b62c6ba3e2..67a493be0253189a2531a9fbaaca54aeebdb0090 100644 (file)
Binary files a/textures/ex2x/floor/floor_h4_norm.tga and b/textures/ex2x/floor/floor_h4_norm.tga differ

diff --git a/textures/ex2x/floor/floor_metal1.tga b/textures/ex2x/floor/floor_metal1.tga
deleted file mode 100644 (file)
index efc01f0..0000000
Binary files a/textures/ex2x/floor/floor_metal1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal1_gloss.tga b/textures/ex2x/floor/floor_metal1_gloss.tga
deleted file mode 100644 (file)
index f3cd3da..0000000
Binary files a/textures/ex2x/floor/floor_metal1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal1_norm.tga b/textures/ex2x/floor/floor_metal1_norm.tga
deleted file mode 100644 (file)
index 0973a3c..0000000
Binary files a/textures/ex2x/floor/floor_metal1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal2.tga b/textures/ex2x/floor/floor_metal2.tga
deleted file mode 100644 (file)
index dc10d51..0000000
Binary files a/textures/ex2x/floor/floor_metal2.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal2_gloss.tga b/textures/ex2x/floor/floor_metal2_gloss.tga
deleted file mode 100644 (file)
index 1147b7b..0000000
Binary files a/textures/ex2x/floor/floor_metal2_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal2_norm.tga b/textures/ex2x/floor/floor_metal2_norm.tga
deleted file mode 100644 (file)
index 2c2c6fd..0000000
Binary files a/textures/ex2x/floor/floor_metal2_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal3_norm.tga b/textures/ex2x/floor/floor_metal3_norm.tga
index 589e78d61261f64004a37d41749d98dafbf2134d..dc667ed4f89251b61de4b3cdc32dc358a767b918 100644 (file)
Binary files a/textures/ex2x/floor/floor_metal3_norm.tga and b/textures/ex2x/floor/floor_metal3_norm.tga differ

diff --git a/textures/ex2x/floor/floor_p1.tga b/textures/ex2x/floor/floor_p1.tga
deleted file mode 100644 (file)
index 775be14..0000000
Binary files a/textures/ex2x/floor/floor_p1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_p1_gloss.tga b/textures/ex2x/floor/floor_p1_gloss.tga
deleted file mode 100644 (file)
index caf6e51..0000000
Binary files a/textures/ex2x/floor/floor_p1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_p1_norm.tga b/textures/ex2x/floor/floor_p1_norm.tga
deleted file mode 100644 (file)
index 038e7f8..0000000
Binary files a/textures/ex2x/floor/floor_p1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_plate1_norm.tga b/textures/ex2x/floor/floor_plate1_norm.tga
index 6bc97084bf76feff7fe67b4c0267d9291f26d14e..83c42ae29b22cd400da29d806720c8e808bff557 100644 (file)
Binary files a/textures/ex2x/floor/floor_plate1_norm.tga and b/textures/ex2x/floor/floor_plate1_norm.tga differ

diff --git a/textures/ex2x/floor/floor_plate2_norm.tga b/textures/ex2x/floor/floor_plate2_norm.tga
index add111ece8cae0247669f124c51a5db784d49b04..8186ce0a35df7a6e2fc29726584a2663b6ade751 100644 (file)
Binary files a/textures/ex2x/floor/floor_plate2_norm.tga and b/textures/ex2x/floor/floor_plate2_norm.tga differ

diff --git a/textures/ex2x/floor/floor_r1.tga b/textures/ex2x/floor/floor_r1.tga
deleted file mode 100644 (file)
index 1d92227..0000000
Binary files a/textures/ex2x/floor/floor_r1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_r1_gloss.tga b/textures/ex2x/floor/floor_r1_gloss.tga
deleted file mode 100644 (file)
index 57b2692..0000000
Binary files a/textures/ex2x/floor/floor_r1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_r1_norm.tga b/textures/ex2x/floor/floor_r1_norm.tga
deleted file mode 100644 (file)
index 7ab0a31..0000000
Binary files a/textures/ex2x/floor/floor_r1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_rust1.tga b/textures/ex2x/floor/floor_rust1.tga
deleted file mode 100644 (file)
index 120cf66..0000000
Binary files a/textures/ex2x/floor/floor_rust1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_rust1_gloss.tga b/textures/ex2x/floor/floor_rust1_gloss.tga
deleted file mode 100644 (file)
index 777547b..0000000
Binary files a/textures/ex2x/floor/floor_rust1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_rust1_norm.tga b/textures/ex2x/floor/floor_rust1_norm.tga
deleted file mode 100644 (file)
index 6ae99c1..0000000
Binary files a/textures/ex2x/floor/floor_rust1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_1_norm.tga b/textures/ex2x/light/light_1_norm.tga
index c3ef0a74eb2bc2f33063f7792bc242a88ade1141..5083dda2dca7faa954b5055a73408c67302cded3 100644 (file)
Binary files a/textures/ex2x/light/light_1_norm.tga and b/textures/ex2x/light/light_1_norm.tga differ

diff --git a/textures/ex2x/light/light_2.tga b/textures/ex2x/light/light_2.tga
deleted file mode 100644 (file)
index 41e9379..0000000
Binary files a/textures/ex2x/light/light_2.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_2_gloss.tga b/textures/ex2x/light/light_2_gloss.tga
deleted file mode 100644 (file)
index df3c4a8..0000000
Binary files a/textures/ex2x/light/light_2_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_2_glow.tga b/textures/ex2x/light/light_2_glow.tga
deleted file mode 100644 (file)
index 7cedd91..0000000
Binary files a/textures/ex2x/light/light_2_glow.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_2_norm.tga b/textures/ex2x/light/light_2_norm.tga
deleted file mode 100644 (file)
index 3b7b150..0000000
Binary files a/textures/ex2x/light/light_2_norm.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_beam_blue_norm.tga b/textures/ex2x/light/light_beam_blue_norm.tga
index 17e0ad86ad514d4c827615e4b5c84887e93ba0dc..f179cb672c475fd8d0591b747f70650dbbef0179 100644 (file)
Binary files a/textures/ex2x/light/light_beam_blue_norm.tga and b/textures/ex2x/light/light_beam_blue_norm.tga differ

diff --git a/textures/ex2x/light/light_beam_red_norm.tga b/textures/ex2x/light/light_beam_red_norm.tga
index 17e0ad86ad514d4c827615e4b5c84887e93ba0dc..f179cb672c475fd8d0591b747f70650dbbef0179 100644 (file)
Binary files a/textures/ex2x/light/light_beam_red_norm.tga and b/textures/ex2x/light/light_beam_red_norm.tga differ

diff --git a/textures/ex2x/trim/trim_green2_norm.tga b/textures/ex2x/trim/trim_green2_norm.tga
index 39c3b07b9b70056308bdbe2c173138a8e69fd3a9..e290bedbc77dccee1c8299cea81aa4a1ff9789b7 100644 (file)
Binary files a/textures/ex2x/trim/trim_green2_norm.tga and b/textures/ex2x/trim/trim_green2_norm.tga differ

diff --git a/textures/ex2x/trim/trim_warn1_norm.tga b/textures/ex2x/trim/trim_warn1_norm.tga
index a6eaabc168c35467c28792780b9f0ae59b0dddfe..d5b75d069d98c74d2714998d87002cef9fffe9ec 100644 (file)
Binary files a/textures/ex2x/trim/trim_warn1_norm.tga and b/textures/ex2x/trim/trim_warn1_norm.tga differ

diff --git a/textures/ex2x/wall/wall_green1.tga b/textures/ex2x/wall/wall_green1.tga
deleted file mode 100644 (file)
index 0d1c9d8..0000000
Binary files a/textures/ex2x/wall/wall_green1.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1_gloss.tga b/textures/ex2x/wall/wall_green1_gloss.tga
deleted file mode 100644 (file)
index a74323b..0000000
Binary files a/textures/ex2x/wall/wall_green1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1_norm.tga b/textures/ex2x/wall/wall_green1_norm.tga
deleted file mode 100644 (file)
index bf9f1da..0000000
Binary files a/textures/ex2x/wall/wall_green1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1dirt.tga b/textures/ex2x/wall/wall_green1dirt.tga
deleted file mode 100644 (file)
index ab0df41..0000000
Binary files a/textures/ex2x/wall/wall_green1dirt.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1dirt_gloss.tga b/textures/ex2x/wall/wall_green1dirt_gloss.tga
deleted file mode 100644 (file)
index a74323b..0000000
Binary files a/textures/ex2x/wall/wall_green1dirt_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1dirt_norm.tga b/textures/ex2x/wall/wall_green1dirt_norm.tga
deleted file mode 100644 (file)
index 694ba6e..0000000
Binary files a/textures/ex2x/wall/wall_green1dirt_norm.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_purple1_norm.tga b/textures/ex2x/wall/wall_purple1_norm.tga
index ac7c276dc6276bcfdfd28d0c8db2949fc44bca1e..abee33e5d2355f63cc15369d183aa2bfd99c2dd7 100644 (file)
Binary files a/textures/ex2x/wall/wall_purple1_norm.tga and b/textures/ex2x/wall/wall_purple1_norm.tga differ