Merge branch 'master' into Mario/overkill
authorMario <mario@smbclan.net>
Sat, 28 Jan 2017 00:57:17 +0000 (10:57 +1000)
committerMario <mario@smbclan.net>
Sat, 28 Jan 2017 00:57:17 +0000 (10:57 +1000)
27 files changed:
models/weapons/g_ok_mg.md3
models/weapons/g_ok_shotgun.md3
models/weapons/g_ok_sniper.md3
models/weapons/h_ok_mg.iqm
models/weapons/h_ok_mg.iqm.framegroups
models/weapons/h_ok_shotgun.iqm
models/weapons/h_ok_shotgun.iqm.framegroups
models/weapons/h_ok_sniper.iqm
models/weapons/h_ok_sniper.iqm.framegroups
models/weapons/v_ok_mg.md3
models/weapons/v_ok_shotgun.md3
models/weapons/v_ok_sniper.md3
scripts/okweapons.shader
textures/weapons/ok_railgun.tga [new file with mode: 0644]
textures/weapons/ok_railgun_gloss.tga [new file with mode: 0644]
textures/weapons/ok_railgun_glow.tga [new file with mode: 0644]
textures/weapons/ok_railgun_reflect.tga [new file with mode: 0644]
textures/weapons/ok_railgun_shirt.tga [new file with mode: 0644]
textures/weapons/ok_shotgun.tga [new file with mode: 0644]
textures/weapons/ok_shotgun_Shirt.tga [new file with mode: 0644]
textures/weapons/ok_shotgun_gloss.tga [new file with mode: 0644]
textures/weapons/ok_shotgun_glow.tga [new file with mode: 0644]
textures/weapons/ok_shotgun_reflect.tga [new file with mode: 0644]
textures/weapons/ok_smg.tga [new file with mode: 0644]
textures/weapons/ok_smg_gloss.tga [new file with mode: 0644]
textures/weapons/ok_smg_glow.tga [new file with mode: 0644]
textures/weapons/ok_smg_reflect.tga [new file with mode: 0644]

index c7e5453..b3f4e34 100644 (file)
Binary files a/models/weapons/g_ok_mg.md3 and b/models/weapons/g_ok_mg.md3 differ
index 4acc77f..f507206 100644 (file)
Binary files a/models/weapons/g_ok_shotgun.md3 and b/models/weapons/g_ok_shotgun.md3 differ
index 4acc77f..669f4c7 100644 (file)
Binary files a/models/weapons/g_ok_sniper.md3 and b/models/weapons/g_ok_sniper.md3 differ
index 6048a9c..d5043b0 100644 (file)
Binary files a/models/weapons/h_ok_mg.iqm and b/models/weapons/h_ok_mg.iqm differ
index 948542a..ac92f77 100644 (file)
@@ -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
index 34ef1c7..5838b30 100644 (file)
Binary files a/models/weapons/h_ok_shotgun.iqm and b/models/weapons/h_ok_shotgun.iqm differ
index 004c9af..b212161 100644 (file)
@@ -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
index 6e6df93..abc34f4 100644 (file)
Binary files a/models/weapons/h_ok_sniper.iqm and b/models/weapons/h_ok_sniper.iqm differ
index 75854d7..38b7f87 100644 (file)
@@ -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
index 71a8e95..14bc4e1 100644 (file)
Binary files a/models/weapons/v_ok_mg.md3 and b/models/weapons/v_ok_mg.md3 differ
index 30fbd6b..979cbc8 100644 (file)
Binary files a/models/weapons/v_ok_shotgun.md3 and b/models/weapons/v_ok_shotgun.md3 differ
index ee0ea46..511f3a3 100644 (file)
Binary files a/models/weapons/v_ok_sniper.md3 and b/models/weapons/v_ok_sniper.md3 differ
index 8873bf2..163da49 100644 (file)
@@ -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