Merge commit 'origin/master' into diabolik/ignisplayermodel

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

diff --git a/models/player/ignis.iqm.framegroups b/models/player/ignis.iqm.framegroups
new file mode 100644 (file)
index 0000000..dc908e6
--- /dev/null
+++ b/models/player/ignis.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 10 15.000000 1 // duck
+81 11 15.000000 1 // duckwalk
+92 16 15.000000 0 // duckjump
+108 15 5.000000 1 // duckidle
+123 16 5.000000 1 // idle
+139 16 15.000000 0 // jump
+155 15 15.000000 0 // painone
+170 17 15.000000 0 // paintwo
+187 3 15.000000 1 // shoot
+190 35 15.000000 1 // taunt
+225 12 20.000000 1 // run
+237 12 20.000000 1 // runbackwards
+249 12 20.000000 1 // strafeleft
+261 12 20.000000 1 // straferight
+273 2 15.000000 0 // deadone
+275 2 15.000000 0 // deadtwo
+277 12 20.000000 1 // forwardright
+289 12 20.000000 1 // forwardleft
+301 12 20.000000 1 // backright
+313 12 20.000000 1 // backleft

diff --git a/models/player/ignis.iqm_0.tga b/models/player/ignis.iqm_0.tga
new file mode 100644 (file)
index 0000000..177b4a6
Binary files /dev/null and b/models/player/ignis.iqm_0.tga differ

diff --git a/models/player/ignis.iqm_0.txt b/models/player/ignis.iqm_0.txt
new file mode 100644 (file)
index 0000000..7597e41
--- /dev/null
+++ b/models/player/ignis.iqm_0.txt
@@ -0,0 +1,7 @@
+name Ignis
+species human
+sex Male
+weight 88
+age 31
+
+Heavyweight Xonotic Solider

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

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

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

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

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

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

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

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

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

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