]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use Taoki's shotgun cannon model (with dark skin) as arc weapon model
authorMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 11:03:16 +0000 (22:03 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 11:03:16 +0000 (22:03 +1100)
12 files changed:
models/weapons/g_arc.md3 [new file with mode: 0755]
models/weapons/h_arc.iqm [new file with mode: 0755]
models/weapons/h_arc.iqm.framegroups [new file with mode: 0755]
models/weapons/v_arc.md3 [new file with mode: 0755]
qcsrc/common/weapons/w_arc.qc
scripts/weapons.shader
textures/arc.tga [new file with mode: 0644]
textures/arc_gloss.tga [new file with mode: 0644]
textures/arc_glow.tga [new file with mode: 0644]
textures/arc_norm.tga [new file with mode: 0644]
textures/arc_reflect.tga [new file with mode: 0644]
textures/arc_shirt.tga [new file with mode: 0644]

diff --git a/models/weapons/g_arc.md3 b/models/weapons/g_arc.md3
new file mode 100755 (executable)
index 0000000..8783739
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 (executable)
index 0000000..9c4a29d
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 (executable)
index 0000000..1c95207
--- /dev/null
@@ -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 (executable)
index 0000000..7415aba
Binary files /dev/null and b/models/weapons/v_arc.md3 differ
index f637d41bf10c1d7fddd7197c4fbcd37aba1dd653..6f0d42bf6b2f32986b09ce3ff722b7d293b8a88c 100644 (file)
@@ -7,7 +7,7 @@ REGISTER_WEAPON(
 /* flags     */ WEP_FLAG_NORMAL,
 /* rating    */ BOT_PICKUP_RATING_HIGH,
 /* color     */ '1 1 1',
 /* 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",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhlac 0.7",
 /* wepimg    */ "weaponhlac",
index a6dcfaab86df5c107a1f64fce159d06f98359b1a..c5c673fbff9c6ad627a3b746f1c28c5c14bfcb59 100644 (file)
@@ -103,3 +103,11 @@ minelayer
                rgbgen lightingDiffuse
        }
 }
                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 (file)
index 0000000..55d2f34
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 (file)
index 0000000..45734a7
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 (file)
index 0000000..2b35751
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 (file)
index 0000000..39e1831
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 (file)
index 0000000..b60f891
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 (file)
index 0000000..90107da
Binary files /dev/null and b/textures/arc_shirt.tga differ