Merge commit 'origin/master' into diabolik/erebusnyxplayermodel

diff --git a/models/player/erebus.iqm b/models/player/erebus.iqm
new file mode 100644 (file)
index 0000000..a69c869
Binary files /dev/null and b/models/player/erebus.iqm differ

diff --git a/models/player/erebus.iqm.framegroups b/models/player/erebus.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/erebus.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/textures/erebus.tga b/textures/erebus.tga
new file mode 100644 (file)
index 0000000..5a470f6
Binary files /dev/null and b/textures/erebus.tga differ

diff --git a/textures/erebus_gloss.tga b/textures/erebus_gloss.tga
new file mode 100644 (file)
index 0000000..992af75
Binary files /dev/null and b/textures/erebus_gloss.tga differ

diff --git a/textures/erebus_glow.tga b/textures/erebus_glow.tga
new file mode 100644 (file)
index 0000000..561e995
Binary files /dev/null and b/textures/erebus_glow.tga differ

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

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

diff --git a/textures/nyx.tga b/textures/nyx.tga
new file mode 100644 (file)
index 0000000..8169f37
Binary files /dev/null and b/textures/nyx.tga differ

diff --git a/textures/nyx_gloss.tga b/textures/nyx_gloss.tga
new file mode 100644 (file)
index 0000000..6b53f91
Binary files /dev/null and b/textures/nyx_gloss.tga differ

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

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

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

diff --git a/textures/shadowhead.tga b/textures/shadowhead.tga
new file mode 100644 (file)
index 0000000..29893e2
Binary files /dev/null and b/textures/shadowhead.tga differ

diff --git a/textures/shadowhead_gloss.tga b/textures/shadowhead_gloss.tga
new file mode 100644 (file)
index 0000000..2abb3f0
Binary files /dev/null and b/textures/shadowhead_gloss.tga differ

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

diff --git a/textures/shadowhead_norm.tga b/textures/shadowhead_norm.tga
new file mode 100644 (file)
index 0000000..19dd82c
Binary files /dev/null and b/textures/shadowhead_norm.tga differ

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