From: Severin Meyer Date: Tue, 4 Aug 2015 11:24:44 +0000 (+0200) Subject: Revise buff shaders X-Git-Tag: xonotic-v0.8.1~18^2~2^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f9ac7f58f51d29bebc72ab87c0ee41c6a21fa0c6;p=xonotic%2Fxonotic-data.pk3dir.git Revise buff shaders --- diff --git a/models/relics/sign_ammo.tga b/models/relics/sign_ammo.tga index b6227f6327..438b74144a 100644 Binary files a/models/relics/sign_ammo.tga and b/models/relics/sign_ammo.tga differ diff --git a/models/relics/sign_ammo_glow.tga b/models/relics/sign_ammo_glow.tga index 8849e924c7..cd3c1b2350 100644 Binary files a/models/relics/sign_ammo_glow.tga and b/models/relics/sign_ammo_glow.tga differ diff --git a/models/relics/sign_bash.tga b/models/relics/sign_bash.tga index 228dfc151c..348b286af7 100644 Binary files a/models/relics/sign_bash.tga and b/models/relics/sign_bash.tga differ diff --git a/models/relics/sign_bash_glow.tga b/models/relics/sign_bash_glow.tga index 482a2b2e04..67b11bbcad 100644 Binary files a/models/relics/sign_bash_glow.tga and b/models/relics/sign_bash_glow.tga differ diff --git a/models/relics/sign_blessed.tga b/models/relics/sign_blessed.tga index 1dbbeb422e..cc3ca4a026 100644 Binary files a/models/relics/sign_blessed.tga and b/models/relics/sign_blessed.tga differ diff --git a/models/relics/sign_blessed_glow.tga b/models/relics/sign_blessed_glow.tga index 0bd6e93585..7606890caa 100644 Binary files a/models/relics/sign_blessed_glow.tga and b/models/relics/sign_blessed_glow.tga differ diff --git a/models/relics/sign_disability.tga b/models/relics/sign_disability.tga index e858a8a1af..565ce19e69 100644 Binary files a/models/relics/sign_disability.tga and b/models/relics/sign_disability.tga differ diff --git a/models/relics/sign_disability_glow.tga b/models/relics/sign_disability_glow.tga index e858a8a1af..ff9bdc295a 100644 Binary files a/models/relics/sign_disability_glow.tga and b/models/relics/sign_disability_glow.tga differ diff --git a/models/relics/sign_flight.tga b/models/relics/sign_flight.tga index 790bfe17e6..0630cd6247 100644 Binary files a/models/relics/sign_flight.tga and b/models/relics/sign_flight.tga differ diff --git a/models/relics/sign_flight_glow.tga b/models/relics/sign_flight_glow.tga index b3f45a927b..9f7a88db33 100644 Binary files a/models/relics/sign_flight_glow.tga and b/models/relics/sign_flight_glow.tga differ diff --git a/models/relics/sign_inferno.tga b/models/relics/sign_inferno.tga index 50842cc5ae..a8bd33fdb5 100644 Binary files a/models/relics/sign_inferno.tga and b/models/relics/sign_inferno.tga differ diff --git a/models/relics/sign_inferno_glow.tga b/models/relics/sign_inferno_glow.tga index 2f5ef0b01b..5fb16d738c 100644 Binary files a/models/relics/sign_inferno_glow.tga and b/models/relics/sign_inferno_glow.tga differ diff --git a/models/relics/sign_invisible.tga b/models/relics/sign_invisible.tga index 1388f49bdb..de1745b09d 100644 Binary files a/models/relics/sign_invisible.tga and b/models/relics/sign_invisible.tga differ diff --git a/models/relics/sign_invisible_glow.tga b/models/relics/sign_invisible_glow.tga index 4def2fa19a..929965fb5a 100644 Binary files a/models/relics/sign_invisible_glow.tga and b/models/relics/sign_invisible_glow.tga differ diff --git a/models/relics/sign_jump.tga b/models/relics/sign_jump.tga index c17e35ae29..7042dabcf9 100644 Binary files a/models/relics/sign_jump.tga and b/models/relics/sign_jump.tga differ diff --git a/models/relics/sign_jump_glow.tga b/models/relics/sign_jump_glow.tga index c17e35ae29..9af4faea63 100644 Binary files a/models/relics/sign_jump_glow.tga and b/models/relics/sign_jump_glow.tga differ diff --git a/models/relics/sign_magnet.tga b/models/relics/sign_magnet.tga index fe4ffe0f81..95bd6e9aa5 100644 Binary files a/models/relics/sign_magnet.tga and b/models/relics/sign_magnet.tga differ diff --git a/models/relics/sign_magnet_glow.tga b/models/relics/sign_magnet_glow.tga index fe4ffe0f81..85a2d66752 100644 Binary files a/models/relics/sign_magnet_glow.tga and b/models/relics/sign_magnet_glow.tga differ diff --git a/models/relics/sign_medic.tga b/models/relics/sign_medic.tga index 318aece371..ce60038100 100644 Binary files a/models/relics/sign_medic.tga and b/models/relics/sign_medic.tga differ diff --git a/models/relics/sign_medic_glow.tga b/models/relics/sign_medic_glow.tga index 4da50d8880..8749b88852 100644 Binary files a/models/relics/sign_medic_glow.tga and b/models/relics/sign_medic_glow.tga differ diff --git a/models/relics/sign_resistance.tga b/models/relics/sign_resistance.tga index e494857a1c..56a11639a7 100644 Binary files a/models/relics/sign_resistance.tga and b/models/relics/sign_resistance.tga differ diff --git a/models/relics/sign_resistance_glow.tga b/models/relics/sign_resistance_glow.tga index cdacba8c7e..0e22a43145 100644 Binary files a/models/relics/sign_resistance_glow.tga and b/models/relics/sign_resistance_glow.tga differ diff --git a/models/relics/sign_speed.tga b/models/relics/sign_speed.tga index ca84dbe091..bca0968251 100644 Binary files a/models/relics/sign_speed.tga and b/models/relics/sign_speed.tga differ diff --git a/models/relics/sign_speed_glow.tga b/models/relics/sign_speed_glow.tga index ca84dbe091..11db4c4ca9 100644 Binary files a/models/relics/sign_speed_glow.tga and b/models/relics/sign_speed_glow.tga differ diff --git a/models/relics/sign_swapper.tga b/models/relics/sign_swapper.tga index d0fbc0c012..f695843409 100644 Binary files a/models/relics/sign_swapper.tga and b/models/relics/sign_swapper.tga differ diff --git a/models/relics/sign_swapper_glow.tga b/models/relics/sign_swapper_glow.tga index d0fbc0c012..846b28884c 100644 Binary files a/models/relics/sign_swapper_glow.tga and b/models/relics/sign_swapper_glow.tga differ diff --git a/models/relics/sign_vampire.tga b/models/relics/sign_vampire.tga index 2f070c9771..179e89882b 100644 Binary files a/models/relics/sign_vampire.tga and b/models/relics/sign_vampire.tga differ diff --git a/models/relics/sign_vampire_glow.tga b/models/relics/sign_vampire_glow.tga index abb8ede824..6f29e078b6 100644 Binary files a/models/relics/sign_vampire_glow.tga and b/models/relics/sign_vampire_glow.tga differ diff --git a/models/relics/sign_vengeance.tga b/models/relics/sign_vengeance.tga index bb142d4308..3b5e6f4ab8 100644 Binary files a/models/relics/sign_vengeance.tga and b/models/relics/sign_vengeance.tga differ diff --git a/models/relics/sign_vengeance_glow.tga b/models/relics/sign_vengeance_glow.tga index bb142d4308..60f916e676 100644 Binary files a/models/relics/sign_vengeance_glow.tga and b/models/relics/sign_vengeance_glow.tga differ diff --git a/scripts/relics.shader b/scripts/relics.shader index 83b50df816..f111a4b77b 100644 --- a/scripts/relics.shader +++ b/scripts/relics.shader @@ -1,151 +1,182 @@ models/relics/relic { dpreflectcube cubemaps/default/sky - { + { map models/relics/relic rgbgen lightingDiffuse } } + models/relics/relic_ring { - { + { map models/relics/relic_ring blendfunc GL_SRC_ALPHA GL_ONE rgbgen lightingDiffuse } } -models/relics/sign_resistance + +models/relics/sign_ammo { + deformVertexes autosprite cull none - { - map models/relics/sign_resistance + nopicmip + { + map models/relics/sign_ammo blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_medic + +models/relics/sign_bash { + deformVertexes autosprite cull none - { - map models/relics/sign_medic + nopicmip + { + map models/relics/sign_bash blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_vampire + +models/relics/sign_blessed { + deformVertexes autosprite cull none - { - map models/relics/sign_vampire + nopicmip + { + map models/relics/sign_blessed blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_ammo + +models/relics/sign_disability { + deformVertexes autosprite cull none - { - map models/relics/sign_ammo + nopicmip + { + map models/relics/sign_disability blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_bash + +models/relics/sign_flight { + deformVertexes autosprite cull none - { - map models/relics/sign_bash + nopicmip + { + map models/relics/sign_flight blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_disability + +models/relics/sign_inferno { + deformVertexes autosprite cull none - { - map models/relics/sign_disability + nopicmip + { + map models/relics/sign_inferno blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_speed + +models/relics/sign_invisible { + deformVertexes autosprite cull none - { - map models/relics/sign_speed + nopicmip + { + map models/relics/sign_invisible blendfunc add - rgbgen lightingDiffuse } } + models/relics/sign_jump { + deformVertexes autosprite cull none - { + nopicmip + { map models/relics/sign_jump blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_flight + +models/relics/sign_magnet { + deformVertexes autosprite cull none - { - map models/relics/sign_flight + nopicmip + { + map models/relics/sign_magnet blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_invisible + +models/relics/sign_medic { + deformVertexes autosprite cull none - { - map models/relics/sign_invisible + nopicmip + { + map models/relics/sign_medic blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_blessed + +models/relics/sign_resistance { + deformVertexes autosprite cull none - { - map models/relics/sign_blessed + nopicmip + { + map models/relics/sign_resistance blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_vengeance + +models/relics/sign_speed { + deformVertexes autosprite cull none - { - map models/relics/sign_vengeance + nopicmip + { + map models/relics/sign_speed blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_inferno + +models/relics/sign_swapper { + deformVertexes autosprite cull none - { - map models/relics/sign_inferno + nopicmip + { + map models/relics/sign_swapper blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_swapper + +models/relics/sign_vampire { + deformVertexes autosprite cull none - { - map models/relics/sign_swapper + nopicmip + { + map models/relics/sign_vampire blendfunc add - rgbgen lightingDiffuse } } -models/relics/sign_magnet + +models/relics/sign_vengeance { + deformVertexes autosprite cull none - { - map models/relics/sign_magnet + nopicmip + { + map models/relics/sign_vengeance blendfunc add - rgbgen lightingDiffuse } }