Include new models by morphed (shotgun model has midair shell)

diff --git a/models/weapons/g_ok_mg.md3 b/models/weapons/g_ok_mg.md3
index c7e5453d7bddfb3e178fdaff36fb7de8f60891f2..b3f4e345d7ae1fe0484bb8bd0f74f050a887d50c 100644 (file)
Binary files a/models/weapons/g_ok_mg.md3 and b/models/weapons/g_ok_mg.md3 differ

diff --git a/models/weapons/g_ok_shotgun.md3 b/models/weapons/g_ok_shotgun.md3
index 4acc77fadd0e70b025d6643bcad7256e83e6b6bf..f507206f13c573aa2193b21ca75ecf2eee56d318 100644 (file)
Binary files a/models/weapons/g_ok_shotgun.md3 and b/models/weapons/g_ok_shotgun.md3 differ

diff --git a/models/weapons/g_ok_sniper.md3 b/models/weapons/g_ok_sniper.md3
index 4acc77fadd0e70b025d6643bcad7256e83e6b6bf..669f4c7acb062f409517c766f7cff8b55df7a5cd 100644 (file)
Binary files a/models/weapons/g_ok_sniper.md3 and b/models/weapons/g_ok_sniper.md3 differ

diff --git a/models/weapons/h_ok_mg.iqm b/models/weapons/h_ok_mg.iqm
index 6048a9c2d075b8ac09d574cfff46831adc4073d0..d5043b0ca9d312fb443ca41580322946c8a880ad 100644 (file)
Binary files a/models/weapons/h_ok_mg.iqm and b/models/weapons/h_ok_mg.iqm differ

diff --git a/models/weapons/h_ok_mg.iqm.framegroups b/models/weapons/h_ok_mg.iqm.framegroups
index 948542ab8920cad4b1b5234fb21c2af52388fcc7..ac92f77e61345a690e8f7cf1f81169c8c72505a7 100644 (file)
--- a/models/weapons/h_ok_mg.iqm.framegroups
+++ b/models/weapons/h_ok_mg.iqm.framegroups
@@ -1,10 +1,9 @@
 /*
-Generated framegroups file for h_uzi
+Generated framegroups file for h_ok_mg
 Used by DarkPlaces to simulate frame groups in DPM models.
 */
 
-1 7 30 0 // h_uzi mgafire
-8 7 30 0 // h_uzi mgafire
-15 101 5 1 // h_uzi mgaidle
-116 61 40 1 // h_uzi mgareload
-177 61 15 1 // h_uzi mgareload
+1 7 30 0 // h_ok_mg fire
+8 7 30 0 // h_ok_mg fire
+15 101 5 1 // h_ok_mg idle
+116 61 30 0 // h_ok_mg reload

diff --git a/models/weapons/h_ok_shotgun.iqm b/models/weapons/h_ok_shotgun.iqm
index 34ef1c7a5afad93eec23bdf3b75198bd30df1949..5838b3090d609562d48f197f81496009a01a246f 100644 (file)
Binary files a/models/weapons/h_ok_shotgun.iqm and b/models/weapons/h_ok_shotgun.iqm differ

diff --git a/models/weapons/h_ok_shotgun.iqm.framegroups b/models/weapons/h_ok_shotgun.iqm.framegroups
index 004c9af4f50278bfd07f6cb535fd408f282e22ea..b21216121a3d39bcf54ab2a92c570c589a5d6348 100644 (file)
--- a/models/weapons/h_ok_shotgun.iqm.framegroups
+++ b/models/weapons/h_ok_shotgun.iqm.framegroups
@@ -1,9 +1,9 @@
 /*
-Generated framegroups file for h_shotgun
+Generated framegroups file for h_ok_shotgun
 Used by DarkPlaces to simulate frame groups in DPM models.
 */
 
-1 22 30 0 // h_shotgun sghmesh_fire
-23 31 30 0 // h_shotgun sghmesh_fire2
-54 201 5 1 // h_shotgun sghmesh_idle
-255 61 30 1 // h_shotgun sghmesh_reload
+1 36 50 0 // h_ok_shotgun fire
+37 36 30 0 // h_ok_shotgun fire
+73 121 5 1 // h_ok_shotgun idle
+194 61 30 0 // h_ok_shotgun reload

diff --git a/models/weapons/h_ok_sniper.iqm b/models/weapons/h_ok_sniper.iqm
index 6e6df934c92f0e4ebd398a948bfb4fe4b67e2eba..abc34f40649f1c0fa5714bc18d7d1c84d6fa4c1a 100644 (file)
Binary files a/models/weapons/h_ok_sniper.iqm and b/models/weapons/h_ok_sniper.iqm differ

diff --git a/models/weapons/h_ok_sniper.iqm.framegroups b/models/weapons/h_ok_sniper.iqm.framegroups
index 75854d74a110d6a4ecd4e54811ceb3ea8768dc60..38b7f87286af17f2be6f3c82ca13fef831450f9b 100644 (file)
--- a/models/weapons/h_ok_sniper.iqm.framegroups
+++ b/models/weapons/h_ok_sniper.iqm.framegroups
@@ -1,9 +1,9 @@
 /*
-Generated framegroups file for h_minstanex
+Generated framegroups file for h_ok_sniper
 Used by DarkPlaces to simulate frame groups in DPM models.
 */
 
-1 28 25 0 // h_minstanex h_minst_fire
-29 28 25 0 // h_minstanex h_minst_fire
-57 201 5 1 // h_minstanex h_minst_idle
-258 28 30 0 // h_minstanex h_minst_reload
+1 31 30 0 // h_ok_sniper fire
+32 31 30 0 // h_ok_sniper fire
+63 121 5 1 // h_ok_sniper idle
+184 31 30 0 // h_ok_sniper reload

diff --git a/models/weapons/v_ok_mg.md3 b/models/weapons/v_ok_mg.md3
index 71a8e95c1219050eacf033cc3054ce60cae63fab..14bc4e1e0f92b9993585e9c4503f82d19c139616 100644 (file)
Binary files a/models/weapons/v_ok_mg.md3 and b/models/weapons/v_ok_mg.md3 differ

diff --git a/models/weapons/v_ok_shotgun.md3 b/models/weapons/v_ok_shotgun.md3
index 30fbd6bd01e3fdc867dab451b62adc18a07621a3..979cbc8876162944e74b2968e2bb723d7bbc801a 100644 (file)
Binary files a/models/weapons/v_ok_shotgun.md3 and b/models/weapons/v_ok_shotgun.md3 differ

diff --git a/models/weapons/v_ok_sniper.md3 b/models/weapons/v_ok_sniper.md3
index ee0ea461fac1d5dd6286ce42916400ac012c7fd9..511f3a3cfda2aab074d3f74493ca5ea1d9013bd2 100644 (file)
Binary files a/models/weapons/v_ok_sniper.md3 and b/models/weapons/v_ok_sniper.md3 differ

diff --git a/scripts/okweapons.shader b/scripts/okweapons.shader
index 8873bf2ff8c0b0f2544ed825b9c335c0b97a7bb5..163da49b6aa1cbfcea30c2ac02053e2beba1a2ac 100644 (file)
--- a/scripts/okweapons.shader
+++ b/scripts/okweapons.shader
@@ -1,3 +1,34 @@
+OK_SMG
+{
+       dpglossexponentmod  64
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/weapons/ok_smg.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+OK_Railgun
+{
+       dpglossexponentmod  64
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/weapons/ok_railgun.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+OK_shotgun
+{
+       dpglossexponentmod  64
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/weapons/ok_shotgun.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+
 minsta
 {
        dpglossexponentmod  64

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

diff --git a/textures/weapons/ok_railgun_gloss.tga b/textures/weapons/ok_railgun_gloss.tga
new file mode 100644 (file)
index 0000000..2e488a4
Binary files /dev/null and b/textures/weapons/ok_railgun_gloss.tga differ

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

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

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

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

diff --git a/textures/weapons/ok_shotgun_Shirt.tga b/textures/weapons/ok_shotgun_Shirt.tga
new file mode 100644 (file)
index 0000000..6c365e1
Binary files /dev/null and b/textures/weapons/ok_shotgun_Shirt.tga differ

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

diff --git a/textures/weapons/ok_shotgun_glow.tga b/textures/weapons/ok_shotgun_glow.tga
new file mode 100644 (file)
index 0000000..306b1ef
Binary files /dev/null and b/textures/weapons/ok_shotgun_glow.tga differ

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

diff --git a/textures/weapons/ok_smg.tga b/textures/weapons/ok_smg.tga
new file mode 100644 (file)
index 0000000..0f5c43e
Binary files /dev/null and b/textures/weapons/ok_smg.tga differ

diff --git a/textures/weapons/ok_smg_gloss.tga b/textures/weapons/ok_smg_gloss.tga
new file mode 100644 (file)
index 0000000..0a141d9
Binary files /dev/null and b/textures/weapons/ok_smg_gloss.tga differ

diff --git a/textures/weapons/ok_smg_glow.tga b/textures/weapons/ok_smg_glow.tga
new file mode 100644 (file)
index 0000000..14f14f5
Binary files /dev/null and b/textures/weapons/ok_smg_glow.tga differ

diff --git a/textures/weapons/ok_smg_reflect.tga b/textures/weapons/ok_smg_reflect.tga
new file mode 100644 (file)
index 0000000..0a141d9
Binary files /dev/null and b/textures/weapons/ok_smg_reflect.tga differ