From: Mario Date: Thu, 6 Nov 2014 11:03:16 +0000 (+1100) Subject: Use Taoki's shotgun cannon model (with dark skin) as arc weapon model X-Git-Tag: xonotic-v0.8.0~152^2~19 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=493bc951895ef01d82def3b2dd2d41517dd9c6fd Use Taoki's shotgun cannon model (with dark skin) as arc weapon model --- diff --git a/models/weapons/g_arc.md3 b/models/weapons/g_arc.md3 new file mode 100755 index 0000000000..8783739641 Binary files /dev/null and b/models/weapons/g_arc.md3 differ diff --git a/models/weapons/h_arc.iqm b/models/weapons/h_arc.iqm new file mode 100755 index 0000000000..9c4a29dbbc Binary files /dev/null and b/models/weapons/h_arc.iqm differ diff --git a/models/weapons/h_arc.iqm.framegroups b/models/weapons/h_arc.iqm.framegroups new file mode 100755 index 0000000000..1c95207bde --- /dev/null +++ b/models/weapons/h_arc.iqm.framegroups @@ -0,0 +1,6 @@ +1 8 20 0 // fire +9 23 20 0 // fire2 +32 200 20 1 // idle +232 40 20 0 // reload +// compile opts used in the iqm exporter (apparently needed to prevent insane ram usage): +// fire:1:8, fire2:1:23, idle:1:200, reload:1:40 diff --git a/models/weapons/v_arc.md3 b/models/weapons/v_arc.md3 new file mode 100755 index 0000000000..7415aba604 Binary files /dev/null and b/models/weapons/v_arc.md3 differ diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index f637d41bf1..6f0d42bf6b 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -7,7 +7,7 @@ REGISTER_WEAPON( /* flags */ WEP_FLAG_NORMAL, /* rating */ BOT_PICKUP_RATING_HIGH, /* color */ '1 1 1', -/* modelname */ "hlac", +/* modelname */ "arc", /* simplemdl */ "foobar", /* crosshair */ "gfx/crosshairhlac 0.7", /* wepimg */ "weaponhlac", diff --git a/scripts/weapons.shader b/scripts/weapons.shader index a6dcfaab86..c5c673fbff 100644 --- a/scripts/weapons.shader +++ b/scripts/weapons.shader @@ -103,3 +103,11 @@ minelayer rgbgen lightingDiffuse } } +shotgun +{ + dpreflectcube cubemaps/default/sky + { + map textures/arc.tga + rgbgen lightingDiffuse + } +} diff --git a/textures/arc.tga b/textures/arc.tga new file mode 100644 index 0000000000..55d2f34b37 Binary files /dev/null and b/textures/arc.tga differ diff --git a/textures/arc_gloss.tga b/textures/arc_gloss.tga new file mode 100644 index 0000000000..45734a7ef7 Binary files /dev/null and b/textures/arc_gloss.tga differ diff --git a/textures/arc_glow.tga b/textures/arc_glow.tga new file mode 100644 index 0000000000..2b3575116a Binary files /dev/null and b/textures/arc_glow.tga differ diff --git a/textures/arc_norm.tga b/textures/arc_norm.tga new file mode 100644 index 0000000000..39e183148f Binary files /dev/null and b/textures/arc_norm.tga differ diff --git a/textures/arc_reflect.tga b/textures/arc_reflect.tga new file mode 100644 index 0000000000..b60f891b0b Binary files /dev/null and b/textures/arc_reflect.tga differ diff --git a/textures/arc_shirt.tga b/textures/arc_shirt.tga new file mode 100644 index 0000000000..90107daa13 Binary files /dev/null and b/textures/arc_shirt.tga differ