Merge branch 'morphed/energyweapons'

diff --git a/models/items/a_cells.md3 b/models/items/a_cells.md3
index 04f6afed4c74eb3e65fdd54bb905bef383797a3f..792d14536bc919802b0c538f23d2cd9915c1fee6 100644 (file)
Binary files a/models/items/a_cells.md3 and b/models/items/a_cells.md3 differ

diff --git a/models/weapons/g_crylink.md3 b/models/weapons/g_crylink.md3
index b325c9c2be28a5cdbafcee989336d78cd0c35900..be0ea1770e397ffeea0050ce07a0726a047432a4 100644 (file)
Binary files a/models/weapons/g_crylink.md3 and b/models/weapons/g_crylink.md3 differ

diff --git a/models/weapons/g_electro.md3 b/models/weapons/g_electro.md3
index 76c2e8962be3a6e84882eb8f9b9d7c299ddce2bb..022891a97e4ce6ac5724f51eb3392ed490b47993 100644 (file)
Binary files a/models/weapons/g_electro.md3 and b/models/weapons/g_electro.md3 differ

diff --git a/models/weapons/h_crylink.iqm b/models/weapons/h_crylink.iqm
index d8de4644f5e64c78810c72f4d599de65e8645fd1..62d571bd2560b876ad083a6d779ee96991df3a92 100644 (file)
Binary files a/models/weapons/h_crylink.iqm and b/models/weapons/h_crylink.iqm differ

diff --git a/models/weapons/h_crylink.iqm.framegroups b/models/weapons/h_crylink.iqm.framegroups
index 0a59625b6a6aa297525c008a66ba879537a5ac08..92a05ebf36fa680acd628cdc34e76e84f3dfb599 100644 (file)
--- a/models/weapons/h_crylink.iqm.framegroups
+++ b/models/weapons/h_crylink.iqm.framegroups
@@ -1,4 +1,9 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
+/*
+Generated framegroups file for h_crylink
+Used by DarkPlaces to simulate frame groups in DPM models.
+*/
+
+1 26 30 0 // h_crylink fire
+27 26 30 0 // h_crylink fire
+53 101 3 1 // h_crylink idle
+154 101 3 1 // h_crylink idle

diff --git a/models/weapons/h_electro.iqm b/models/weapons/h_electro.iqm
index a726b33f2408f1f10586710183ba2c3eef2b0a7a..df0d79506daea7196c2f46c0648f34ccfaba1268 100644 (file)
Binary files a/models/weapons/h_electro.iqm and b/models/weapons/h_electro.iqm differ

diff --git a/models/weapons/h_electro.iqm.framegroups b/models/weapons/h_electro.iqm.framegroups
index 0a59625b6a6aa297525c008a66ba879537a5ac08..f6df25a7171aa3bf97f591107f06442f7ee2cfe2 100644 (file)
--- a/models/weapons/h_electro.iqm.framegroups
+++ b/models/weapons/h_electro.iqm.framegroups
@@ -1,4 +1,9 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
+/*
+Generated framegroups file for h_electro
+Used by DarkPlaces to simulate frame groups in DPM models.
+*/
+
+1 36 30 0 // h_electro fire
+37 36 30 0 // h_electro fire
+73 101 3 1 // h_electro idle
+174 101 3 1 // h_electro idle

diff --git a/models/weapons/v_crylink.md3 b/models/weapons/v_crylink.md3
index c3b9f3ca833a84a8818bf32df9b6a914fc8a843e..dc73d47dc09c65dc204b38f329a80fc5c1bd9f3e 100644 (file)
Binary files a/models/weapons/v_crylink.md3 and b/models/weapons/v_crylink.md3 differ

diff --git a/models/weapons/v_electro.md3 b/models/weapons/v_electro.md3
index 67105bcf6f1686260de4501e9d485f8a1e69b112..2e45a678665fe15200078d3533e2b1bf6d8783b2 100644 (file)
Binary files a/models/weapons/v_electro.md3 and b/models/weapons/v_electro.md3 differ

diff --git a/scripts/cellammo.Shader b/scripts/cellammo.Shader
new file mode 100644 (file)
index 0000000..94b1c88
--- /dev/null
+++ b/scripts/cellammo.Shader
@@ -0,0 +1,9 @@
+cellammo\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       dpoffsetmapping - 0.5 match8 128\r
+       {\r
+               map textures/items/cellammo\r
+               rgbgen lightingDiffuse\r
+       }\r
+}
\ No newline at end of file

diff --git a/scripts/crylink.shader b/scripts/crylink.shader
new file mode 100644 (file)
index 0000000..ab59f84
--- /dev/null
+++ b/scripts/crylink.shader
@@ -0,0 +1,9 @@
+crylink_new
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/crylink_new.tga
+               rgbgen lightingDiffuse
+       }
+}
+

diff --git a/scripts/electro.shader b/scripts/electro.shader
index 84fa2405050688836e684cb11ba502227de6542a..f87b86c8d99c4d4680e3497f194e90a28b219e8b 100644 (file)
--- a/scripts/electro.shader
+++ b/scripts/electro.shader
@@ -14,3 +14,12 @@ electro_plasma_hull
        rgbGen Vertex
         }
 }
+
+electro
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/electronew.tga
+               rgbgen lightingDiffuse
+       }
+}
\ No newline at end of file

diff --git a/textures/cellammoskin.jpg b/textures/cellammoskin.jpg
deleted file mode 100644 (file)
index 116ba9d..0000000
Binary files a/textures/cellammoskin.jpg and /dev/null differ

diff --git a/textures/cellammoskin_glow.jpg b/textures/cellammoskin_glow.jpg
deleted file mode 100644 (file)
index 274913c..0000000
Binary files a/textures/cellammoskin_glow.jpg and /dev/null differ

diff --git a/textures/crylink.tga b/textures/crylink.tga
deleted file mode 100644 (file)
index c07f02a..0000000
Binary files a/textures/crylink.tga and /dev/null differ

diff --git a/textures/crylink_bump.tga b/textures/crylink_bump.tga
deleted file mode 100644 (file)
index bae1984..0000000
Binary files a/textures/crylink_bump.tga and /dev/null differ

diff --git a/textures/crylink_gloss.tga b/textures/crylink_gloss.tga
deleted file mode 100644 (file)
index 84e2c17..0000000
Binary files a/textures/crylink_gloss.tga and /dev/null differ

diff --git a/textures/crylink_glow.jpg b/textures/crylink_glow.jpg
deleted file mode 100644 (file)
index de4be8e..0000000
Binary files a/textures/crylink_glow.jpg and /dev/null differ

diff --git a/textures/crylink_new.tga b/textures/crylink_new.tga
new file mode 100644 (file)
index 0000000..877f08e
Binary files /dev/null and b/textures/crylink_new.tga differ

diff --git a/textures/crylink_new_gloss.tga b/textures/crylink_new_gloss.tga
new file mode 100644 (file)
index 0000000..871a1b3
Binary files /dev/null and b/textures/crylink_new_gloss.tga differ

diff --git a/textures/crylink_new_glow.tga b/textures/crylink_new_glow.tga
new file mode 100644 (file)
index 0000000..933ddcf
Binary files /dev/null and b/textures/crylink_new_glow.tga differ

diff --git a/textures/crylink_new_norm.tga b/textures/crylink_new_norm.tga
new file mode 100644 (file)
index 0000000..026bf1d
Binary files /dev/null and b/textures/crylink_new_norm.tga differ

diff --git a/textures/crylink_new_reflect.tga b/textures/crylink_new_reflect.tga
new file mode 100644 (file)
index 0000000..70d35c0
Binary files /dev/null and b/textures/crylink_new_reflect.tga differ

diff --git a/textures/crylink_new_shirt.tga b/textures/crylink_new_shirt.tga
new file mode 100644 (file)
index 0000000..630dada
Binary files /dev/null and b/textures/crylink_new_shirt.tga differ

diff --git a/textures/crylink_reflect.tga b/textures/crylink_reflect.tga
deleted file mode 100644 (file)
index ec7857b..0000000
Binary files a/textures/crylink_reflect.tga and /dev/null differ

diff --git a/textures/crylink_shirt.tga b/textures/crylink_shirt.tga
deleted file mode 100644 (file)
index ae10ecc..0000000
Binary files a/textures/crylink_shirt.tga and /dev/null differ

diff --git a/textures/electro.tga b/textures/electro.tga
deleted file mode 100644 (file)
index adf55c2..0000000
Binary files a/textures/electro.tga and /dev/null differ

diff --git a/textures/electro_gloss.tga b/textures/electro_gloss.tga
deleted file mode 100644 (file)
index d506dcb..0000000
Binary files a/textures/electro_gloss.tga and /dev/null differ

diff --git a/textures/electro_glow.tga b/textures/electro_glow.tga
deleted file mode 100644 (file)
index 9c6a5bf..0000000
Binary files a/textures/electro_glow.tga and /dev/null differ

diff --git a/textures/electro_norm.tga b/textures/electro_norm.tga
deleted file mode 100644 (file)
index 019abc9..0000000
Binary files a/textures/electro_norm.tga and /dev/null differ

diff --git a/textures/electro_reflect.tga b/textures/electro_reflect.tga
deleted file mode 100644 (file)
index 95cc2ba..0000000
Binary files a/textures/electro_reflect.tga and /dev/null differ

diff --git a/textures/electronew.tga b/textures/electronew.tga
new file mode 100644 (file)
index 0000000..54e3706
Binary files /dev/null and b/textures/electronew.tga differ

diff --git a/textures/electronew_gloss.tga b/textures/electronew_gloss.tga
new file mode 100644 (file)
index 0000000..a59c080
Binary files /dev/null and b/textures/electronew_gloss.tga differ

diff --git a/textures/electronew_glow.tga b/textures/electronew_glow.tga
new file mode 100644 (file)
index 0000000..f539968
Binary files /dev/null and b/textures/electronew_glow.tga differ

diff --git a/textures/electronew_norm.tga b/textures/electronew_norm.tga
new file mode 100644 (file)
index 0000000..8341b47
Binary files /dev/null and b/textures/electronew_norm.tga differ

diff --git a/textures/electronew_reflect.tga b/textures/electronew_reflect.tga
new file mode 100644 (file)
index 0000000..073600b
Binary files /dev/null and b/textures/electronew_reflect.tga differ

diff --git a/textures/electronew_shirt.tga b/textures/electronew_shirt.tga
new file mode 100644 (file)
index 0000000..38d99d6
Binary files /dev/null and b/textures/electronew_shirt.tga differ

diff --git a/textures/items/cellammo.tga b/textures/items/cellammo.tga
new file mode 100644 (file)
index 0000000..50b6483
Binary files /dev/null and b/textures/items/cellammo.tga differ

diff --git a/textures/items/cellammo_gloss.tga b/textures/items/cellammo_gloss.tga
new file mode 100644 (file)
index 0000000..64b22bc
Binary files /dev/null and b/textures/items/cellammo_gloss.tga differ

diff --git a/textures/items/cellammo_glow.tga b/textures/items/cellammo_glow.tga
new file mode 100644 (file)
index 0000000..b44ff6f
Binary files /dev/null and b/textures/items/cellammo_glow.tga differ

diff --git a/textures/items/cellammo_norm.tga b/textures/items/cellammo_norm.tga
new file mode 100644 (file)
index 0000000..f7cd352
Binary files /dev/null and b/textures/items/cellammo_norm.tga differ

diff --git a/textures/items/cellammo_reflect.tga b/textures/items/cellammo_reflect.tga
new file mode 100644 (file)
index 0000000..96c0759
Binary files /dev/null and b/textures/items/cellammo_reflect.tga differ