Merge remote branch 'origin/divVerent/bastet'

diff --git a/scripts/electro.shader b/scripts/electro.shader
new file mode 100644 (file)
index 0000000..29fa15a
--- /dev/null
+++ b/scripts/electro.shader
@@ -0,0 +1,16 @@
+textures/electro_plasma
+{
+ {
+       map textures/electro_plasma.tga
+       tcMod scroll 0.03 0.001
+ }
+}
+
+textures/electro_plasma_hull
+{
+        {
+       map textures/electro_plasma_hull.tga
+       alphaFunc GT0
+       rgbGen Vertex
+        }
+}

diff --git a/scripts/fireball.shader b/scripts/fireball.shader
new file mode 100644 (file)
index 0000000..aeed387
--- /dev/null
+++ b/scripts/fireball.shader
@@ -0,0 +1,10 @@
+textures/fireball
+{
+       {
+               map textures/fireball
+               tcgen environment
+       }
+       {
+               map $lightmap
+       }
+}

diff --git a/scripts/flags.shader b/scripts/flags.shader
new file mode 100644 (file)
index 0000000..12ba575
--- /dev/null
+++ b/scripts/flags.shader
@@ -0,0 +1,33 @@
+textures/flags/flag_red_cloth {
+       cull none
+       deformVertexes wave 100 sin 0 0.4 0 2.5
+       {
+               map textures/flags/flag_red_cloth.tga
+       }
+}
+
+textures/flags/flag_red_laser {
+       {
+               map textures/flags/flag_red_laser.tga
+               tcMod scroll 0.2 -1
+               blendfunc add
+       }
+}
+
+
+textures/flags/flag_blue_cloth {
+       cull none
+       deformVertexes wave 100 sin 0 0.4 0 2.5
+       {
+               map textures/flags/flag_blue_cloth.tga
+       }
+}
+
+textures/flags/flag_blue_laser {
+       {
+               map textures/flags/flag_blue_laser.tga
+               tcMod scroll 0.2 -1
+               blendfunc add
+       }
+}
+

diff --git a/scripts/hlac.shader b/scripts/hlac.shader
new file mode 100644 (file)
index 0000000..cd85d93
--- /dev/null
+++ b/scripts/hlac.shader
@@ -0,0 +1,40 @@
+hlac_plasma
+{
+ {
+       map textures/hlac_plasma.tga
+       tcMod scroll 22.5 0.2
+       tcmod scale 0.01 0.01
+ }
+}
+
+hlac_metal
+{
+        cull none
+        {
+                map textures/hlac_metal.tga
+                rgbgen vertex
+        }
+}
+hlac_glass
+{
+       qer_editorimage textures/hlac_glass.tga
+       surfaceparm trans
+       cull disable
+       qer_trans 0.5
+       {
+               map textures/hlac_glass.tga
+               blendfunc add
+               //rgbGen vertex
+               tcgen environment
+               tcmod scale 4 4
+       }       
+}
+hlac_bullet
+{
+       cull disable
+       deformVertexes autosprite
+       {
+               map models/hlac_bullet.tga
+               blendfunc add
+       }       
+}

diff --git a/scripts/onslaught.shader b/scripts/onslaught.shader
new file mode 100644 (file)
index 0000000..6b9c946
--- /dev/null
+++ b/scripts/onslaught.shader
@@ -0,0 +1,99 @@
+ons_shield
+{
+ {
+       map textures/ons_shield.tga
+       tcMod rotate 15
+       tcMod scale 0.3 0.3
+       tcMod scroll 0.03 0.001
+       tcGen environment
+ }
+}
+
+ons_pad_text
+{
+       cull none
+ {
+       map textures/ons_text.tga
+       tcMod scroll 0.1 0
+       blendfunc add
+
+ }
+}
+
+ons_icon_text
+{
+ {
+       map textures/ons_text.tga
+       tcMod scroll 0.1 0
+ }
+}
+
+ons_icon_thrust
+{
+ {
+       map textures/ons_icon_thrust.tga
+       tcMod scroll 3 0
+       tcMod rotate 10
+ }
+}
+ons_gen_spark
+{
+       cull none
+ {
+       animmap 9 textures/generator_lightning.tga textures/generator_lightning2.tga
+       tcMod scroll 0.5 0
+       blendfunc add
+
+ }
+}
+ons_fire
+{
+ {
+       map textures/ons_boom1.tga
+       tcMod scroll 0.05 0.1
+       tcMod rotate 0.01
+       blendfunc add
+
+ }
+}
+ons_smoke
+{
+       deformVertexes wave sin 1 3 2 0.2
+ {
+       map textures/ons_smoke1.tga
+       tcMod scroll 0.01 0.04
+       tcMod rotate 0.01
+       alphaFunc GE128
+
+ }
+}
+ons_shockwave
+{
+       cull none
+ {
+       map textures/ons_shockwave1.tga
+       tcMod scroll 0.2 0
+       blendfunc add
+
+ }
+}
+ons_shockwave2
+{
+ {
+       map textures/ons_shockwave2.tga
+       tcMod rotate 85
+       tcMod scroll 0.03 0.6
+       tcGen environment
+       blendfunc add
+ }
+}
+
+ons_ray
+{
+cull none
+ {
+       map textures/ons_ray.tga
+       tcMod rotate 85
+       blendfunc add
+ }
+}
\ No newline at end of file

diff --git a/scripts/portals.shader b/scripts/portals.shader
new file mode 100644 (file)
index 0000000..9473c3a
--- /dev/null
+++ b/scripts/portals.shader
@@ -0,0 +1,68 @@
+portals_red_vortex
+{
+       cull none
+       deformVertexes wave 100 sin 1.5 0.6 0 1.5
+       {
+               map textures/portals/portals_red_vortex.tga
+               tcMod rotate 10
+               blendfunc blend
+       }
+}
+
+portals_blue_vortex
+{
+       cull none
+       deformVertexes wave 100 sin 1.5 0.6 0 1.5
+       {
+               map textures/portals/portals_blue_vortex.tga
+               tcMod rotate 10
+               blendfunc blend
+       }
+}
+
+portals_inactive_vortex
+{
+       cull none
+       deformVertexes wave 100 sin 1.5 0.6 0 1.5
+       {
+               map textures/portals/portals_inactive_vortex.tga
+               tcMod rotate 10
+               blendfunc blend
+       }
+}
+
+textures/portals/portals_red
+{
+       surfaceparm nonsolid
+       {
+               map textures/portals/portals_red.tga
+       }
+       {
+               map $lightmap
+               blendfunc filter
+       }
+}
+
+textures/portals/portals_blue
+{
+       surfaceparm nonsolid
+       {
+               map textures/portals/portals_blue.tga
+       }
+       {
+               map $lightmap
+               blendfunc filter
+       }
+}
+
+textures/portals/portals_inactive
+{
+       surfaceparm nonsolid
+       {
+               map textures/portals/portals_inactive.tga
+       }
+       {
+               map $lightmap
+               blendfunc filter
+       }
+}

diff --git a/scripts/shotgun.shader b/scripts/shotgun.shader
new file mode 100644 (file)
index 0000000..0392304
--- /dev/null
+++ b/scripts/shotgun.shader
@@ -0,0 +1,10 @@
+textures/shotgun_sight
+{
+       surfaceparm trans
+
+       {
+               map textures/shotgun_sight.tga
+               blendfunc add
+               //rgbGen vertex
+       }       
+}

diff --git a/scripts/spiderbot.shader b/scripts/spiderbot.shader
new file mode 100644 (file)
index 0000000..445fed5
--- /dev/null
+++ b/scripts/spiderbot.shader
@@ -0,0 +1,10 @@
+darkvisor
+{
+       qer_editorimage darkvisor.tga
+       {
+               map darkvisor.tga
+               rgbGen vertex
+               tcgen environment
+               tcmod scale 4 4
+       }       
+}
\ No newline at end of file

diff --git a/scripts/teamfx.shader b/scripts/teamfx.shader
new file mode 100644 (file)
index 0000000..8f368af
--- /dev/null
+++ b/scripts/teamfx.shader
@@ -0,0 +1,120 @@
+teamfx/blobblue
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/blobblue.tga
+       blendfunc add
+}
+}
+
+teamfx/blobred
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/blobred.tga
+       blendfunc add
+}
+
+}
+
+teamfx/blobyellow
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/blobyellow.tga
+       blendfunc add
+}
+
+}
+
+teamfx/blobpink
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/blobpink.tga
+       blendfunc add
+}
+
+}
+
+teamfx/bluering
+{
+surfaceparm trans
+{
+       map models/teamfx/blobblue.tga
+       blendfunc add
+}
+}
+teamfx/redring
+{
+surfaceparm trans
+{
+       map models/teamfx/blobyellow.tga
+       blendfunc add
+}
+}
+teamfx/yellowring
+{
+surfaceparm trans
+{
+       map models/teamfx/blobpink.tga
+       blendfunc add
+}
+}
+teamfx/pinkring
+{
+surfaceparm trans
+{
+       map models/teamfx/blobpink.tga
+       blendfunc add
+}
+}
+teamfx/flare
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/flare.tga
+       blendfunc add
+}
+}
+teamfx/rayblue
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/rayblue.tga
+       blendfunc add
+}
+}
+teamfx/rayred
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/rayred.tga
+       blendfunc add
+}
+}
+teamfx/rayyellow
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/rayyellow.tga
+       blendfunc add
+}
+}
+teamfx/raypink
+{
+surfaceparm trans
+deformVertexes autosprite
+{
+       map models/teamfx/raypink.tga
+       blendfunc add
+}
+}

diff --git a/scripts/tuba.shader b/scripts/tuba.shader
new file mode 100644 (file)
index 0000000..e5e0da4
--- /dev/null
+++ b/scripts/tuba.shader
@@ -0,0 +1,19 @@
+textures/tuba
+{
+       {
+               map textures/tuba
+               tcgen environment
+       }
+       {
+               map $lightmap
+       }
+}
+textures/tuba_misc
+{
+       {
+               map textures/tuba
+       }
+       {
+               map $lightmap
+       }
+}