Squashed commit of the following:
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 17:09:51 +0000 (18:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 17:09:51 +0000 (18:09 +0100)
commit2f3178e8eb1917ca0090c9bffd221c0d06543376
tree66d40aa9ada1b72e247685265df2a8fd98ba459f
parent7bdcba4ec30d657fd982a89a346f2d47b73bf651
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"
49 files changed:
scripts/ex2x.shader
textures/ex2x/base/base_bluepaint_norm.tga
textures/ex2x/base/base_chainlink_norm.tga
textures/ex2x/base/base_metal1_norm.tga
textures/ex2x/base/base_metal2_norm.tga
textures/ex2x/base/base_metal3_norm.tga
textures/ex2x/base/base_metal4_norm.tga
textures/ex2x/base/base_metalmaterial1_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_stone_metal_norm.tga
textures/ex2x/base/base_yellowpaint_norm.tga
textures/ex2x/floor/floor_1_norm.tga
textures/ex2x/floor/floor_h1_norm.tga
textures/ex2x/floor/floor_h2_norm.tga
textures/ex2x/floor/floor_h3_norm.tga
textures/ex2x/floor/floor_h4_norm.tga
textures/ex2x/floor/floor_metal1.tga [deleted file]
textures/ex2x/floor/floor_metal1_gloss.tga [deleted file]
textures/ex2x/floor/floor_metal1_norm.tga [deleted file]
textures/ex2x/floor/floor_metal2.tga [deleted file]
textures/ex2x/floor/floor_metal2_gloss.tga [deleted file]
textures/ex2x/floor/floor_metal2_norm.tga [deleted file]
textures/ex2x/floor/floor_metal3_norm.tga
textures/ex2x/floor/floor_p1.tga [deleted file]
textures/ex2x/floor/floor_p1_gloss.tga [deleted file]
textures/ex2x/floor/floor_p1_norm.tga [deleted file]
textures/ex2x/floor/floor_plate1_norm.tga
textures/ex2x/floor/floor_plate2_norm.tga
textures/ex2x/floor/floor_r1.tga [deleted file]
textures/ex2x/floor/floor_r1_gloss.tga [deleted file]
textures/ex2x/floor/floor_r1_norm.tga [deleted file]
textures/ex2x/floor/floor_rust1.tga [deleted file]
textures/ex2x/floor/floor_rust1_gloss.tga [deleted file]
textures/ex2x/floor/floor_rust1_norm.tga [deleted file]
textures/ex2x/light/light_1_norm.tga
textures/ex2x/light/light_2.tga [deleted file]
textures/ex2x/light/light_2_gloss.tga [deleted file]
textures/ex2x/light/light_2_glow.tga [deleted file]
textures/ex2x/light/light_2_norm.tga [deleted file]
textures/ex2x/light/light_beam_blue_norm.tga
textures/ex2x/light/light_beam_red_norm.tga
textures/ex2x/trim/trim_green2_norm.tga
textures/ex2x/trim/trim_warn1_norm.tga
textures/ex2x/wall/wall_green1.tga [deleted file]
textures/ex2x/wall/wall_green1_gloss.tga [deleted file]
textures/ex2x/wall/wall_green1_norm.tga [deleted file]
textures/ex2x/wall/wall_green1dirt.tga [deleted file]
textures/ex2x/wall/wall_green1dirt_gloss.tga [deleted file]
textures/ex2x/wall/wall_green1dirt_norm.tga [deleted file]
textures/ex2x/wall/wall_purple1_norm.tga