Merge branch 'master' into morphed/hagar

diff --git a/models/weapons/g_hagar.md3 b/models/weapons/g_hagar.md3
index 6e21ba9f83a4d578b2b8454aacff8f9aeb3d6c73..2047627bf65db56cac69da5050a85deb20800edf 100644 (file)
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 a51c6c4f5ed4238b772ffa4853ae24127aa9aeaf..fe87dac0304abecf381443d8a506c743948977a1 100644 (file)
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 0a59625b6a6aa297525c008a66ba879537a5ac08..e02cf0f641f77d9e1a8e8a2d937e87e8e2e9377a 100644 (file)
--- 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 19a245343322da6aa2dbfbb7de9b9a96c63264cf..f1f08b0108f984ae73ea0cb9e11bffa012e1dff6 100644 (file)
Binary files a/models/weapons/v_hagar.md3 and b/models/weapons/v_hagar.md3 differ

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index c5c673fbff9c6ad627a3b746f1c28c5c14bfcb59..cebdf69c092a2f9e85ab925f884af6c23c353007 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -31,11 +31,11 @@ glauncher
                rgbgen lightingDiffuse
        }
 }
-hagar2
+hagar
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/hagar2.tga
+               map textures/hagar.tga
                rgbgen lightingDiffuse
        }
 }

diff --git a/textures/hagar.tga b/textures/hagar.tga
new file mode 100644 (file)
index 0000000..1e2d5cf
Binary files /dev/null and b/textures/hagar.tga differ

diff --git a/textures/hagar2.tga b/textures/hagar2.tga
deleted file mode 100644 (file)
index f05fef9..0000000
Binary files a/textures/hagar2.tga and /dev/null differ

diff --git a/textures/hagar2_gloss.tga b/textures/hagar2_gloss.tga
deleted file mode 100644 (file)
index f4f597a..0000000
Binary files a/textures/hagar2_gloss.tga and /dev/null differ

diff --git a/textures/hagar2_glow.tga b/textures/hagar2_glow.tga
deleted file mode 100644 (file)
index cd4b353..0000000
Binary files a/textures/hagar2_glow.tga and /dev/null differ

diff --git a/textures/hagar2_norm.tga b/textures/hagar2_norm.tga
deleted file mode 100644 (file)
index 145509d..0000000
Binary files a/textures/hagar2_norm.tga and /dev/null differ

diff --git a/textures/hagar2_reflect.tga b/textures/hagar2_reflect.tga
deleted file mode 100644 (file)
index 1381edc..0000000
Binary files a/textures/hagar2_reflect.tga and /dev/null differ

diff --git a/textures/hagar2_shirt.tga b/textures/hagar2_shirt.tga
deleted file mode 100644 (file)
index 4527f7e..0000000
Binary files a/textures/hagar2_shirt.tga and /dev/null differ

diff --git a/textures/hagar_glow.tga b/textures/hagar_glow.tga
new file mode 100644 (file)
index 0000000..e1d9548
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 (file)
index 0000000..b758791
Binary files /dev/null and b/textures/hagar_norm.tga differ

diff --git a/textures/hagar_reflect.tga b/textures/hagar_reflect.tga
new file mode 100644 (file)
index 0000000..f784c2d
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 (file)
index 0000000..270d446
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 (file)
index 0000000..e44d88b
Binary files /dev/null and b/textures/hagar_spec.tga differ