Squashed commit of the following:

commit 1c957af5b9748c46d92a4fa3da93d2c1a19ba778
Merge: a4ae0be 69a2e2b
Author: Samual <samual@xonotic.org>
Date:   Fri Dec 2 15:17:19 2011 -0500

    Merge remote branch 'origin/master' into morphed/minstanex

commit a4ae0be7220424ea0c8d7621b815cc482b18d828
Merge: ebe8eee 0396c95
Author: Samual <samual@xonotic.org>
Date:   Fri Dec 2 02:28:35 2011 -0500

    Merge remote branch 'origin/master' into morphed/minstanex

commit ebe8eee72691e07c3731e4c88f25de4a751a5339
Author: Morphed <morphed@o2.pl>
Date:   Thu Dec 1 23:09:59 2011 +0100

    stupid git !!! forgot models

commit d1bb9dd137bd9ec9372b08776c88c8dfd91de39d
Author: Morphed <morphed@o2.pl>
Date:   Thu Dec 1 22:40:13 2011 +0100

    minstanex by LJFHutch/theShadow #woxblox#

diff --git a/models/weapons/g_minstanex.md3 b/models/weapons/g_minstanex.md3
index 4575e9be4d2399fcc718625d73f17eef48a45300..847e3149ca1cdbf459006f0c55251a7e4f8c3f1f 100644 (file)
Binary files a/models/weapons/g_minstanex.md3 and b/models/weapons/g_minstanex.md3 differ

diff --git a/models/weapons/h_minstanex.iqm b/models/weapons/h_minstanex.iqm
index 60d9af6021ae3dfce881763ea35bcf6754e27672..82b0b23303677dd5691606fe905becba1ad19568 100644 (file)
Binary files a/models/weapons/h_minstanex.iqm and b/models/weapons/h_minstanex.iqm differ

diff --git a/models/weapons/h_minstanex.iqm.framegroups b/models/weapons/h_minstanex.iqm.framegroups
index 0a59625b6a6aa297525c008a66ba879537a5ac08..9c7e7021cf861112551214fd9e733e54e218b7a5 100644 (file)
--- a/models/weapons/h_minstanex.iqm.framegroups
+++ b/models/weapons/h_minstanex.iqm.framegroups
@@ -1,4 +1,10 @@
-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_uzi
+Used by DarkPlaces to simulate frame groups in DPM models.
+*/
+
+1 16 30 0 // h_uzi mgafire
+17 16 30 0 // h_uzi mgafire2
+33 101 3 1 // h_uzi mgaidle
+134 61 30 0 // h_uzi mgareload
+195 16 30 0 // h_uzi mgafire

diff --git a/models/weapons/mnex.tga b/models/weapons/mnex.tga
new file mode 100644 (file)
index 0000000..b4df2a3
Binary files /dev/null and b/models/weapons/mnex.tga differ

diff --git a/models/weapons/mnex_bump.tga b/models/weapons/mnex_bump.tga
new file mode 100644 (file)
index 0000000..98b3a5c
Binary files /dev/null and b/models/weapons/mnex_bump.tga differ

diff --git a/models/weapons/mnex_gloss.tga b/models/weapons/mnex_gloss.tga
new file mode 100644 (file)
index 0000000..8750a0e
Binary files /dev/null and b/models/weapons/mnex_gloss.tga differ

diff --git a/models/weapons/mnex_glow.tga b/models/weapons/mnex_glow.tga
new file mode 100644 (file)
index 0000000..aa54029
Binary files /dev/null and b/models/weapons/mnex_glow.tga differ

diff --git a/models/weapons/mnex_reflect.tga b/models/weapons/mnex_reflect.tga
new file mode 100644 (file)
index 0000000..f7fa7c8
Binary files /dev/null and b/models/weapons/mnex_reflect.tga differ

diff --git a/models/weapons/mnex_shirt.tga b/models/weapons/mnex_shirt.tga
new file mode 100644 (file)
index 0000000..dd371d6
Binary files /dev/null and b/models/weapons/mnex_shirt.tga differ

diff --git a/models/weapons/v_minstanex.md3 b/models/weapons/v_minstanex.md3
index d583e1a616ee5e9cf4d0bf3f7e4f8fccf634c7c3..d08b8feff520645d57f88e7c37d55a2ead975cb6 100644 (file)
Binary files a/models/weapons/v_minstanex.md3 and b/models/weapons/v_minstanex.md3 differ

diff --git a/scripts/mnex.shader b/scripts/mnex.shader
new file mode 100644 (file)
index 0000000..718c93e
--- /dev/null
+++ b/scripts/mnex.shader
@@ -0,0 +1,9 @@
+MNex-Diffuse
+{
+       dpglossexponentmod  64
+       dpreflectcube env/exomorph/exomorph
+       {
+               map models/weapons/mnex.tga
+               rgbgen lightingDiffuse
+       }
+}
\ No newline at end of file