Some more variations for jumppad models. Added new texture files, skin files and...

diff --git a/models/xonotic_jumppad01/energy_green.tga b/models/xonotic_jumppad01/energy_green.tga
new file mode 100644 (file)
index 0000000..350d431
Binary files /dev/null and b/models/xonotic_jumppad01/energy_green.tga differ

diff --git a/models/xonotic_jumppad01/energy_orange.tga b/models/xonotic_jumppad01/energy_orange.tga
new file mode 100644 (file)
index 0000000..cfddae7
Binary files /dev/null and b/models/xonotic_jumppad01/energy_orange.tga differ

diff --git a/models/xonotic_jumppad01/energy_purple.tga b/models/xonotic_jumppad01/energy_purple.tga
new file mode 100644 (file)
index 0000000..c5ab00e
Binary files /dev/null and b/models/xonotic_jumppad01/energy_purple.tga differ

diff --git a/models/xonotic_jumppad01/energy_yellow.tga b/models/xonotic_jumppad01/energy_yellow.tga
new file mode 100644 (file)
index 0000000..b9fe24a
Binary files /dev/null and b/models/xonotic_jumppad01/energy_yellow.tga differ

diff --git a/models/xonotic_jumppad01/jumpglow_p.tga b/models/xonotic_jumppad01/jumpglow_p.tga
new file mode 100644 (file)
index 0000000..7dfda2f
Binary files /dev/null and b/models/xonotic_jumppad01/jumpglow_p.tga differ

diff --git a/models/xonotic_jumppad01/jumpglow_y.tga b/models/xonotic_jumppad01/jumpglow_y.tga
new file mode 100644 (file)
index 0000000..7931ea4
Binary files /dev/null and b/models/xonotic_jumppad01/jumpglow_y.tga differ

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_2.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_2.skin
new file mode 100644 (file)
index 0000000..9e91b43
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_2.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_green
+energy,models/xonotic_jumppad01/energy_green_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_3.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_3.skin
new file mode 100644 (file)
index 0000000..0fcd9d8
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_3.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_yellow
+energy,models/xonotic_jumppad01/energy_yellow_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_4.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_4.skin
new file mode 100644 (file)
index 0000000..311ac58
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_4.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_orange
+energy,models/xonotic_jumppad01/energy_orange_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_5.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_5.skin
new file mode 100644 (file)
index 0000000..e51a8c9
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_5.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_purple
+energy,models/xonotic_jumppad01/energy_purple_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_2.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_2.skin
new file mode 100644 (file)
index 0000000..9e91b43
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_2.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_green
+energy,models/xonotic_jumppad01/energy_green_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_3.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_3.skin
new file mode 100644 (file)
index 0000000..0fcd9d8
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_3.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_yellow
+energy,models/xonotic_jumppad01/energy_yellow_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_4.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_4.skin
new file mode 100644 (file)
index 0000000..311ac58
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_4.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_orange
+energy,models/xonotic_jumppad01/energy_orange_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_5.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_5.skin
new file mode 100644 (file)
index 0000000..e51a8c9
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_5.skin
@@ -0,0 +1,6 @@
+flame,models/xonotic_jumppad01/jumpglow_purple
+energy,models/xonotic_jumppad01/energy_purple_anim
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a

diff --git a/scripts/model_xonotic_jumppad01.shader b/scripts/model_xonotic_jumppad01.shader
index a4d01a91d46bc4e10182c995a08f732ce6a77dcc..4f3a41c900e107e874a2cdab8b06452e98849f41 100644 (file)
--- a/scripts/model_xonotic_jumppad01.shader
+++ b/scripts/model_xonotic_jumppad01.shader
@@ -1,3 +1,5 @@
+//Effects shaders for xonotic_jumppad01 and xonotic_jumlaunchpad01 models
+//"Flame" parts
 models/xonotic_jumppad01/jumpglow_orange
 {
        qer_editorimage models/xonotic_jumppad01/jumpglow_o.tga
@@ -40,6 +42,29 @@ models/xonotic_jumppad01/jumpglow_blue
  }
 }
 
+models/xonotic_jumppad01/jumpglow_yellow
+{
+       qer_editorimage models/xonotic_jumppad01/jumpglow_y.tga
+       cull none
+ {
+       map models/xonotic_jumppad01/jumpglow_y.tga
+       blendfunc add
+       tcmod page 3 1 0.02
+ }
+}
+
+models/xonotic_jumppad01/jumpglow_purple
+{
+       qer_editorimage models/xonotic_jumppad01/jumpglow_p.tga
+       cull none
+ {
+       map models/xonotic_jumppad01/jumpglow_p.tga
+       blendfunc add
+       tcmod page 3 1 0.02
+ }
+}
+
+//Energy bubbles
 models/xonotic_jumppad01/energy_red_anim
 {
        qer_editorimage models/xonotic_jumppad01/energy_red.tga
@@ -89,3 +114,103 @@ models/xonotic_jumppad01/energy_blue_anim
                tcMod scroll -.5 -.3
        }
 }
+
+models/xonotic_jumppad01/energy_green_anim
+{
+       qer_editorimage models/xonotic_jumppad01/energy_green.tga
+       nopicmip
+       surfaceparm nolightmap
+//     surfaceparm nonsolid
+       surfaceparm trans
+//     surfaceparm slick
+       cull none
+       surfaceparm nomarks // Added
+//     surfaceparm noimpact // by
+//     surfaceparm playerclip // Q
+       qer_trans 0.8
+//     alphaFunc GE128
+       
+       {
+               map models/xonotic_jumppad01/energy_green.tga
+               tcGen environment
+//                tcmod scale .6 .6
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.5
+               tcMod scroll -.5 -.3
+       }
+}
+
+models/xonotic_jumppad01/energy_yellow_anim
+{
+       qer_editorimage models/xonotic_jumppad01/energy_yellow.tga
+       nopicmip
+       surfaceparm nolightmap
+//     surfaceparm nonsolid
+       surfaceparm trans
+//     surfaceparm slick
+       cull none
+       surfaceparm nomarks // Added
+//     surfaceparm noimpact // by
+//     surfaceparm playerclip // Q
+       qer_trans 0.8
+//     alphaFunc GE128
+       
+       {
+               map models/xonotic_jumppad01/energy_yellow.tga
+               tcGen environment
+//                tcmod scale .6 .6
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.5
+               tcMod scroll -.5 -.3
+       }
+}
+
+models/xonotic_jumppad01/energy_orange_anim
+{
+       qer_editorimage models/xonotic_jumppad01/energy_orange.tga
+       nopicmip
+       surfaceparm nolightmap
+//     surfaceparm nonsolid
+       surfaceparm trans
+//     surfaceparm slick
+       cull none
+       surfaceparm nomarks // Added
+//     surfaceparm noimpact // by
+//     surfaceparm playerclip // Q
+       qer_trans 0.8
+//     alphaFunc GE128
+       
+       {
+               map models/xonotic_jumppad01/energy_orange.tga
+               tcGen environment
+//                tcmod scale .6 .6
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.5
+               tcMod scroll -.5 -.3
+       }
+}
+
+models/xonotic_jumppad01/energy_purple_anim
+{
+       qer_editorimage models/xonotic_jumppad01/energy_purple.tga
+       nopicmip
+       surfaceparm nolightmap
+//     surfaceparm nonsolid
+       surfaceparm trans
+//     surfaceparm slick
+       cull none
+       surfaceparm nomarks // Added
+//     surfaceparm noimpact // by
+//     surfaceparm playerclip // Q
+       qer_trans 0.8
+//     alphaFunc GE128
+       
+       {
+               map models/xonotic_jumppad01/energy_purple.tga
+               tcGen environment
+//                tcmod scale .6 .6
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.5
+               tcMod scroll -.5 -.3
+       }
+}
\ No newline at end of file