Merge remote branch 'origin/master' into diabolik/umbraplayermodel

diff --git a/models/player/umbra.blend b/models/player/umbra.blend
new file mode 100644 (file)
index 0000000..bcd6a64
Binary files /dev/null and b/models/player/umbra.blend differ

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

diff --git a/models/player/umbra.iqm.framegroups b/models/player/umbra.iqm.framegroups
new file mode 100644 (file)
index 0000000..dc908e6
--- /dev/null
+++ b/models/player/umbra.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/umbra.iqm_0.tga b/models/player/umbra.iqm_0.tga
new file mode 100644 (file)
index 0000000..f515b2f
Binary files /dev/null and b/models/player/umbra.iqm_0.tga differ

diff --git a/models/player/umbra.iqm_0.txt b/models/player/umbra.iqm_0.txt
new file mode 100644 (file)
index 0000000..807311d
--- /dev/null
+++ b/models/player/umbra.iqm_0.txt
@@ -0,0 +1,11 @@
+name Umbra
+species human
+sex Female
+weight 61
+age 25
+
+Lightweight Xonotic Solider
+
+Sex: Female
+Weight: 61 kg
+Age: 25

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

diff --git a/models/player/umbra.txt b/models/player/umbra.txt
new file mode 100644 (file)
index 0000000..8daf96d
--- /dev/null
+++ b/models/player/umbra.txt
@@ -0,0 +1,11 @@
+Umbra
+models/player/umbra
+0
+models/player/umbra.iqm
+species human
+
+Lightweight Xonotic Solider
+
+Sex: Female
+Weight: 61 kg
+Age: 25

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

diff --git a/textures/umbra_gloss.jpg b/textures/umbra_gloss.jpg
new file mode 100644 (file)
index 0000000..116ebbd
Binary files /dev/null and b/textures/umbra_gloss.jpg differ

diff --git a/textures/umbra_glow.jpg b/textures/umbra_glow.jpg
new file mode 100644 (file)
index 0000000..f18553a
Binary files /dev/null and b/textures/umbra_glow.jpg differ

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

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

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