]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Squashed commit of the following:
authorRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 16:14:34 +0000 (18:14 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 16:14:34 +0000 (18:14 +0200)
commit6de90e8e1aa8beadabc03ce349a3cb4cbeef999c
treec37ee7235e40ee8b2c34079f1ed48ba7b2c1d38d
parent10c8dae2509c7c5a6c5b5fda7d2607a93b8bf9d4
Squashed commit of the following:

commit 321d3a6e9b5fb405850e613fe1d30cc15f287b08
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 18:00:51 2010 +0200

    yet another attempt at fixing normals. Parameters: heightsource=1 filter=3 scale=0.4

commit 739ce7735f5715fecf997e9ec1ee47e7789a3af1
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:56:32 2010 +0200

    another attempt

commit f2a8032b8c86aede59656996f9d6965c566b04ff
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:47:00 2010 +0200

    redid normalmaps with different settings (3x3 Prewitt, 30% scale)

commit 68ddcb38722c31375c50c095accb5868cbaa2ab4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:09:20 2010 +0200

    replace bump by norm maps

commit c41ed619474526d44c794fa908bab6dd89d25c84
Merge: 821968e 10c8dae
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:18:50 2010 +0200

    Merge branch 'master' into diabolik/eX2x

commit 821968edf839a5f4bf266e1da9ea963823295ca0
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:16:37 2010 +0200

    add base-yellowpaint too

commit 0f3e661c96f9b9ec1d3605758c304b1dc2f970c0
Merge: dc0855e a2e171d
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:15:11 2010 +0200

    Merge branch 'master' into diabolik/eX2x

commit dc0855e24c2cd03e2ea568717e163e4ae5f18183
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:13:48 2010 +0200

    make ex2x/base-chainlink actually transparent

commit 212718e02d0d77801424410a2fac664fbadca1c7
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Date:   Fri Aug 20 00:10:38 2010 -0400

    Remove chainlink_alfa.

commit 15fec8069700a9101416f49d522cbd6956ea3083
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Date:   Thu Aug 19 17:42:55 2010 -0400

    ex2x by Kay. New texture set. Hopefully organized correctly.
100 files changed:
scripts/ex2x.shader [new file with mode: 0644]
scripts/shaderlist.txt
textures/ex2x/base/base_bluepaint.tga [new file with mode: 0644]
textures/ex2x/base/base_bluepaint_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_bluepaint_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_chainlink.tga [new file with mode: 0644]
textures/ex2x/base/base_chainlink_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_chainlink_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_metal1.tga [new file with mode: 0644]
textures/ex2x/base/base_metal1_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_metal1_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_metal2.tga [new file with mode: 0644]
textures/ex2x/base/base_metal2_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_metal2_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_metal3.tga [new file with mode: 0644]
textures/ex2x/base/base_metal3_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_metal3_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_metal4.tga [new file with mode: 0644]
textures/ex2x/base/base_metal4_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_metal4_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_metalmaterial1.tga [new file with mode: 0644]
textures/ex2x/base/base_metalmaterial1_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_stone_metal.tga [new file with mode: 0644]
textures/ex2x/base/base_stone_metal_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_stone_metal_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_yellowpaint.tga [new file with mode: 0644]
textures/ex2x/base/base_yellowpaint_gloss.tga [new file with mode: 0644]
textures/ex2x/base/base_yellowpaint_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_1_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h1_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h2.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h2_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h2_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h3.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h3_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h3_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h4.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h4_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_h4_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal1_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal2.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal2_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal2_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal3.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal3_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal3_glow.tga [new file with mode: 0644]
textures/ex2x/floor/floor_metal3_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_p1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_p1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_p1_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_plate1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_plate1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_plate1_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_plate2.tga [new file with mode: 0644]
textures/ex2x/floor/floor_plate2_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_plate2_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_r1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_r1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_r1_norm.tga [new file with mode: 0644]
textures/ex2x/floor/floor_rust1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_rust1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_rust1_norm.tga [new file with mode: 0644]
textures/ex2x/light/light_1.tga [new file with mode: 0644]
textures/ex2x/light/light_1_gloss.tga [new file with mode: 0644]
textures/ex2x/light/light_1_glow.tga [new file with mode: 0644]
textures/ex2x/light/light_1_norm.tga [new file with mode: 0644]
textures/ex2x/light/light_2.tga [new file with mode: 0644]
textures/ex2x/light/light_2_gloss.tga [new file with mode: 0644]
textures/ex2x/light/light_2_glow.tga [new file with mode: 0644]
textures/ex2x/light/light_2_norm.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_blue.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_blue_gloss.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_blue_glow.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_blue_norm.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_red.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_red_gloss.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_red_glow.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_red_norm.tga [new file with mode: 0644]
textures/ex2x/trim/trim_green2.tga [new file with mode: 0644]
textures/ex2x/trim/trim_green2_gloss.tga [new file with mode: 0644]
textures/ex2x/trim/trim_green2_glow.tga [new file with mode: 0644]
textures/ex2x/trim/trim_green2_norm.tga [new file with mode: 0644]
textures/ex2x/trim/trim_warn1.tga [new file with mode: 0644]
textures/ex2x/trim/trim_warn1_gloss.tga [new file with mode: 0644]
textures/ex2x/trim/trim_warn1_norm.tga [new file with mode: 0644]
textures/ex2x/wall/wall_green1.tga [new file with mode: 0644]
textures/ex2x/wall/wall_green1_gloss.tga [new file with mode: 0644]
textures/ex2x/wall/wall_green1_norm.tga [new file with mode: 0644]
textures/ex2x/wall/wall_green1dirt.tga [new file with mode: 0644]
textures/ex2x/wall/wall_green1dirt_gloss.tga [new file with mode: 0644]
textures/ex2x/wall/wall_green1dirt_norm.tga [new file with mode: 0644]
textures/ex2x/wall/wall_purple1.tga [new file with mode: 0644]
textures/ex2x/wall/wall_purple1_gloss.tga [new file with mode: 0644]
textures/ex2x/wall/wall_purple1_norm.tga [new file with mode: 0644]