From: PeterMorphed Date: Sat, 7 Nov 2015 15:11:52 +0000 (+0000) Subject: New hagar weapon model X-Git-Tag: xonotic-v0.8.2~1183^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8fa88e463d021e96013e0cce1360818c01c147ea;p=xonotic%2Fxonotic-data.pk3dir.git New hagar weapon model --- diff --git a/models/weapons/g_hagar.md3 b/models/weapons/g_hagar.md3 index 6e21ba9f8..2047627bf 100644 Binary files a/models/weapons/g_hagar.md3 and b/models/weapons/g_hagar.md3 differ diff --git a/models/weapons/h_hagar.iqm b/models/weapons/h_hagar.iqm index a51c6c4f5..fe87dac03 100644 Binary files a/models/weapons/h_hagar.iqm and b/models/weapons/h_hagar.iqm differ diff --git a/models/weapons/h_hagar.iqm.framegroups b/models/weapons/h_hagar.iqm.framegroups index 0a59625b6..e02cf0f64 100644 --- a/models/weapons/h_hagar.iqm.framegroups +++ b/models/weapons/h_hagar.iqm.framegroups @@ -1,4 +1,9 @@ -1 8 20 0 // fire -9 5 20 0 // fire2 -15 200 20 1 // idle -215 40 20 0 // reload +/* +Generated framegroups file for h_hagar +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 11 15 1 // h_hagar fire +12 9 60 1 // h_hagar fire2 +21 51 5 1 // h_hagar idle +72 21 30 1 // h_hagar reload diff --git a/models/weapons/v_hagar.md3 b/models/weapons/v_hagar.md3 index 19a245343..f1f08b010 100644 Binary files a/models/weapons/v_hagar.md3 and b/models/weapons/v_hagar.md3 differ diff --git a/scripts/hagar.shader b/scripts/hagar.shader new file mode 100644 index 000000000..5fb0b0584 --- /dev/null +++ b/scripts/hagar.shader @@ -0,0 +1,8 @@ +hagar +{ + dpreflectcube cubemaps/default/sky + { + map textures/hagar.tga + rgbgen lightingDiffuse + } +} \ No newline at end of file diff --git a/textures/Hagar.tga b/textures/Hagar.tga new file mode 100644 index 000000000..1e2d5cfdd Binary files /dev/null and b/textures/Hagar.tga differ diff --git a/textures/Hagar_Reflect.tga b/textures/Hagar_Reflect.tga new file mode 100644 index 000000000..f784c2db5 Binary files /dev/null and b/textures/Hagar_Reflect.tga differ diff --git a/textures/Hagar_Shirt.tga b/textures/Hagar_Shirt.tga new file mode 100644 index 000000000..270d4464a Binary files /dev/null and b/textures/Hagar_Shirt.tga differ diff --git a/textures/Hagar_Spec.tga b/textures/Hagar_Spec.tga new file mode 100644 index 000000000..e44d88ba0 Binary files /dev/null and b/textures/Hagar_Spec.tga differ diff --git a/textures/hagar_Glow.tga b/textures/hagar_Glow.tga new file mode 100644 index 000000000..e1d9548f7 Binary files /dev/null and b/textures/hagar_Glow.tga differ diff --git a/textures/hagar_norm.tga b/textures/hagar_norm.tga new file mode 100644 index 000000000..b758791e3 Binary files /dev/null and b/textures/hagar_norm.tga differ