Added 4 lightning shaders. Textures were made by Oblivion.

diff --git a/scripts/xonotic-fx.shader b/scripts/xonotic-fx.shader
index 58310fdf6dcc1f72f3f8a699c857b2a50923e3a2..2ecc362bf5104284d170816ab51d63ba56c7cb8a 100644 (file)
--- a/scripts/xonotic-fx.shader
+++ b/scripts/xonotic-fx.shader
@@ -138,4 +138,68 @@ textures/fx/jumppadfx1-d
                blendfunc add
                tcMod scroll 0 2
        }
+}
+//Lightning1-a
+textures/fx/lightning1-a
+{
+       qer_editorimage textures/fx/lightnings/lightning1_1.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga
+               blendfunc add
+       }
+}
+//Lightning1-b
+textures/fx/lightning1-b
+{
+       qer_editorimage textures/fx/lightnings/lightning1_4.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga
+               blendfunc add
+       }
+}
+//Lightning1-c
+textures/fx/lightning1-c
+{
+       qer_editorimage textures/fx/lightnings/lightning1_6.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga
+               blendfunc add
+       }
+}
+//Lightning1-d
+textures/fx/lightning1-d
+{
+       qer_editorimage textures/fx/lightnings/lightning1_8.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga
+               blendfunc add
+       }
 }
\ No newline at end of file

diff --git a/textures/fx/lightnings/lightning1_1.tga b/textures/fx/lightnings/lightning1_1.tga
new file mode 100644 (file)
index 0000000..f63178a
Binary files /dev/null and b/textures/fx/lightnings/lightning1_1.tga differ

diff --git a/textures/fx/lightnings/lightning1_10.tga b/textures/fx/lightnings/lightning1_10.tga
new file mode 100644 (file)
index 0000000..2997919
Binary files /dev/null and b/textures/fx/lightnings/lightning1_10.tga differ

diff --git a/textures/fx/lightnings/lightning1_11.tga b/textures/fx/lightnings/lightning1_11.tga
new file mode 100644 (file)
index 0000000..0605d60
Binary files /dev/null and b/textures/fx/lightnings/lightning1_11.tga differ

diff --git a/textures/fx/lightnings/lightning1_2.tga b/textures/fx/lightnings/lightning1_2.tga
new file mode 100644 (file)
index 0000000..e4e3c31
Binary files /dev/null and b/textures/fx/lightnings/lightning1_2.tga differ

diff --git a/textures/fx/lightnings/lightning1_3.tga b/textures/fx/lightnings/lightning1_3.tga
new file mode 100644 (file)
index 0000000..16ee873
Binary files /dev/null and b/textures/fx/lightnings/lightning1_3.tga differ

diff --git a/textures/fx/lightnings/lightning1_4.tga b/textures/fx/lightnings/lightning1_4.tga
new file mode 100644 (file)
index 0000000..433203a
Binary files /dev/null and b/textures/fx/lightnings/lightning1_4.tga differ

diff --git a/textures/fx/lightnings/lightning1_5.tga b/textures/fx/lightnings/lightning1_5.tga
new file mode 100644 (file)
index 0000000..d057f53
Binary files /dev/null and b/textures/fx/lightnings/lightning1_5.tga differ

diff --git a/textures/fx/lightnings/lightning1_6.tga b/textures/fx/lightnings/lightning1_6.tga
new file mode 100644 (file)
index 0000000..c824b6a
Binary files /dev/null and b/textures/fx/lightnings/lightning1_6.tga differ

diff --git a/textures/fx/lightnings/lightning1_7.tga b/textures/fx/lightnings/lightning1_7.tga
new file mode 100644 (file)
index 0000000..4bf30c6
Binary files /dev/null and b/textures/fx/lightnings/lightning1_7.tga differ

diff --git a/textures/fx/lightnings/lightning1_8.tga b/textures/fx/lightnings/lightning1_8.tga
new file mode 100644 (file)
index 0000000..28ad42b
Binary files /dev/null and b/textures/fx/lightnings/lightning1_8.tga differ

diff --git a/textures/fx/lightnings/lightning1_9.tga b/textures/fx/lightnings/lightning1_9.tga
new file mode 100644 (file)
index 0000000..d5bc91d
Binary files /dev/null and b/textures/fx/lightnings/lightning1_9.tga differ