From: Mario Date: Thu, 21 Jul 2016 07:23:04 +0000 (+1000) Subject: Add simple items for overkill's heavy machinegun and rocket propelled chainsaw X-Git-Tag: xonotic-v0.8.2~700^2~56 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d544f9d6fcdb1ec60b0b9712ea561516f8ff3e3;p=xonotic%2Fxonotic-data.pk3dir.git Add simple items for overkill's heavy machinegun and rocket propelled chainsaw --- diff --git a/models/weapons/g_ok_hmg_luma.iqm b/models/weapons/g_ok_hmg_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_ok_hmg_luma.iqm differ diff --git a/models/weapons/g_ok_hmg_luma.iqm_0.skin b/models/weapons/g_ok_hmg_luma.iqm_0.skin new file mode 100644 index 000000000..2c77f8ec7 --- /dev/null +++ b/models/weapons/g_ok_hmg_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_ok_hmg_luma diff --git a/models/weapons/g_ok_hmg_luma.tga b/models/weapons/g_ok_hmg_luma.tga new file mode 100644 index 000000000..5f8e13548 Binary files /dev/null and b/models/weapons/g_ok_hmg_luma.tga differ diff --git a/models/weapons/g_ok_hmg_simple.iqm b/models/weapons/g_ok_hmg_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_ok_hmg_simple.iqm differ diff --git a/models/weapons/g_ok_hmg_simple.iqm_0.skin b/models/weapons/g_ok_hmg_simple.iqm_0.skin new file mode 100644 index 000000000..f4316a52c --- /dev/null +++ b/models/weapons/g_ok_hmg_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_ok_hmg_simple \ No newline at end of file diff --git a/models/weapons/g_ok_hmg_simple.tga b/models/weapons/g_ok_hmg_simple.tga new file mode 100644 index 000000000..c811a597e Binary files /dev/null and b/models/weapons/g_ok_hmg_simple.tga differ diff --git a/models/weapons/g_ok_rl_luma.iqm b/models/weapons/g_ok_rl_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_ok_rl_luma.iqm differ diff --git a/models/weapons/g_ok_rl_luma.iqm_0.skin b/models/weapons/g_ok_rl_luma.iqm_0.skin new file mode 100644 index 000000000..502ff5b25 --- /dev/null +++ b/models/weapons/g_ok_rl_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_ok_rl_luma diff --git a/models/weapons/g_ok_rl_luma.tga b/models/weapons/g_ok_rl_luma.tga new file mode 100644 index 000000000..b2471c8dd Binary files /dev/null and b/models/weapons/g_ok_rl_luma.tga differ diff --git a/models/weapons/g_ok_rl_simple.iqm b/models/weapons/g_ok_rl_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_ok_rl_simple.iqm differ diff --git a/models/weapons/g_ok_rl_simple.iqm_0.skin b/models/weapons/g_ok_rl_simple.iqm_0.skin new file mode 100644 index 000000000..804fe521f --- /dev/null +++ b/models/weapons/g_ok_rl_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_ok_rl_simple \ No newline at end of file diff --git a/models/weapons/g_ok_rl_simple.tga b/models/weapons/g_ok_rl_simple.tga new file mode 100644 index 000000000..53f1be567 Binary files /dev/null and b/models/weapons/g_ok_rl_simple.tga differ diff --git a/scripts/luma.shader b/scripts/luma.shader index ab2d0c611..b6ee3cd8a 100644 --- a/scripts/luma.shader +++ b/scripts/luma.shader @@ -423,3 +423,25 @@ g_uzi_luma blendfunc blend } } + +g_ok_hmg_luma +{ + deformVertexes autosprite + cull none + nopicmip + { + map models/weapons/g_ok_hmg_luma + blendfunc blend + } +} + +g_ok_rl_luma +{ + deformVertexes autosprite + cull none + nopicmip + { + map models/weapons/g_ok_rl_luma + blendfunc blend + } +} diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader index 92e9e5aff..3a7d11eaf 100644 --- a/scripts/simpleitems.shader +++ b/scripts/simpleitems.shader @@ -300,6 +300,32 @@ g_tuba_simple // tuba } } +g_ok_hmg_simple // heavy machinegun +{ + deformVertexes autosprite + cull none + nopicmip + + { + map models/weapons/g_ok_hmg_simple + blendfunc blend + + } +} + +g_ok_rl_simple // rocket propelled chainsaw +{ + deformVertexes autosprite + cull none + nopicmip + + { + map models/weapons/g_ok_rl_simple + blendfunc blend + + } +} + ////////// ARMOR + HEALTH ITEMS ////////// ///// ARMOR /////