From: Mario Date: Sat, 28 Jan 2017 11:36:05 +0000 (+0000) Subject: Merge branch 'Mario/overkill' into 'master' X-Git-Tag: xonotic-v0.8.2~266 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=0c46469c66df201aecb8bfd37fd089a242848097;hp=9d3095b486f5b548a7457f2856205f6ff55b01ac;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Mario/overkill' into 'master' Merge branch Mario/overkill (S merge request) See merge request !407 --- diff --git a/models/weapons/g_ok_mg.md3 b/models/weapons/g_ok_mg.md3 index c7e5453d7..b3f4e345d 100644 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 4acc77fad..f507206f1 100644 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 4acc77fad..669f4c7ac 100644 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 6048a9c2d..f2a8db949 100644 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 948542ab8..4b61b95cc 100644 --- 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 46 30 0 // h_ok_mg reload diff --git a/models/weapons/h_ok_shotgun.iqm b/models/weapons/h_ok_shotgun.iqm index 34ef1c7a5..a6ea499ed 100644 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 004c9af4f..b21216121 100644 --- 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 6e6df934c..abc34f406 100644 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 75854d74a..38b7f8728 100644 --- 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 71a8e95c1..14bc4e1e0 100644 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 30fbd6bd0..979cbc887 100644 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 ee0ea461f..511f3a3cf 100644 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 8873bf2ff..163da49b6 100644 --- 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 index 000000000..c7ccde622 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 index 000000000..2e488a4fc 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 index 000000000..fb5a742b4 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 index 000000000..d99f590c4 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 index 000000000..f6db627ad 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 index 000000000..aae54cca3 Binary files /dev/null and b/textures/weapons/ok_shotgun.tga differ diff --git a/textures/weapons/ok_shotgun_gloss.tga b/textures/weapons/ok_shotgun_gloss.tga new file mode 100644 index 000000000..898292059 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 index 000000000..306b1ef96 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 index 000000000..08444269e Binary files /dev/null and b/textures/weapons/ok_shotgun_reflect.tga differ diff --git a/textures/weapons/ok_shotgun_shirt.tga b/textures/weapons/ok_shotgun_shirt.tga new file mode 100644 index 000000000..6c365e100 Binary files /dev/null and b/textures/weapons/ok_shotgun_shirt.tga differ diff --git a/textures/weapons/ok_smg.tga b/textures/weapons/ok_smg.tga new file mode 100644 index 000000000..0f5c43e45 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 index 000000000..0a141d90e 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 index 000000000..14f14f5a5 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 index 000000000..0a141d90e Binary files /dev/null and b/textures/weapons/ok_smg_reflect.tga differ