Merge remote branch 'origin/master' into fruitiex/newpanelhud

diff --git a/models/player/ignis.iqm b/models/player/ignis.iqm
index aefdc83ad93081f86f5644c62e0e3990c496260a..cccb00c319317c96f918bc3f5d50da8f88d1fd3c 100644 (file)
Binary files a/models/player/ignis.iqm and b/models/player/ignis.iqm differ

diff --git a/models/player/ignis.iqm_0.tga b/models/player/ignis.iqm_0.tga
index 177b4a6966297ada6f73083f21b7c738fc565c54..990538486d3ef5ba43bbb9df4959b71384a3262f 100644 (file)
Binary files a/models/player/ignis.iqm_0.tga and b/models/player/ignis.iqm_0.tga differ

diff --git a/models/player/ignishalfmasked.iqm b/models/player/ignishalfmasked.iqm
index 017485a4d159e7cd17dbb19afe73c266e3926d0c..5a823e2424f23877cc8dc872724e57c394f7fe40 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm and b/models/player/ignishalfmasked.iqm differ

diff --git a/models/player/ignishalfmasked.iqm_0.tga b/models/player/ignishalfmasked.iqm_0.tga
index f1aecb2845f875be415206f8d6bfe1d2b137cf96..c0beb4ac351ee7ede131b44446093b46aec9f2f5 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm_0.tga and b/models/player/ignishalfmasked.iqm_0.tga differ

diff --git a/models/player/ignismasked.iqm b/models/player/ignismasked.iqm
index df34e30718efc163aa2fdc33418265e2f2277d50..a165aac0733d91f010b3a5158464fe2c6d75a63b 100644 (file)
Binary files a/models/player/ignismasked.iqm and b/models/player/ignismasked.iqm differ

diff --git a/models/player/ignismasked.iqm_0.tga b/models/player/ignismasked.iqm_0.tga
index 8e22e63c2a410482c15644e618cb07f4845e403c..572e8fe877ace319a222542f568e2c437e332bc4 100644 (file)
Binary files a/models/player/ignismasked.iqm_0.tga and b/models/player/ignismasked.iqm_0.tga differ

diff --git a/models/player/pyria.iqm_0.tga b/models/player/pyria.iqm_0.tga
index 7b81093b853deac56976cf6f12c4ab8eb5723508..b155a57ec7b802501eb6e716b9b59e3ecb388f35 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ

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

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

diff --git a/models/player/seraphina.iqm_0.txt b/models/player/seraphina.iqm_0.txt
new file mode 100644 (file)
index 0000000..6b4fcf6
--- /dev/null
+++ b/models/player/seraphina.iqm_0.txt
@@ -0,0 +1,7 @@
+name Seraphina
+species human
+sex Female
+weight 89
+age 31
+
+Heavyweight Xonotic Solider

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

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

diff --git a/models/player/seraphinamasked.iqm_0.txt b/models/player/seraphinamasked.iqm_0.txt
new file mode 100644 (file)
index 0000000..4776359
--- /dev/null
+++ b/models/player/seraphinamasked.iqm_0.txt
@@ -0,0 +1,7 @@
+name Seraphina - Masked
+species human
+sex Female
+weight 90
+age 31
+
+Heavyweight Xonotic Solider

diff --git a/models/player/umbra.iqm_0.tga b/models/player/umbra.iqm_0.tga
index 726d3298190e184e23a2a65a5be13e86c12370fb..d3b3cc4c127a70bfbd161d1f011e37522c5ee827 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ

diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index b67cc76aadc206c591f8f1f3f249ecc394f9af6b..e1f325a6798003f93b524defef46167617f063cf 100644 (file)
--- a/qcsrc/client/projectile.qc
+++ b/qcsrc/client/projectile.qc
@@ -69,7 +69,15 @@ void Projectile_Draw()
        if(self.count & 0x80)
        {
                //self.move_flags &~= FL_ONGROUND;
-               Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy);
+               if(self.move_movetype == MOVETYPE_NONE || self.move_movetype == MOVETYPE_FLY)
+                       Movetype_Physics_NoMatchServer();
+                       // the trivial movetypes do not have to match the
+                       // server's ticrate as they are ticrate independent
+                       // NOTE: this assumption is only true if MOVETYPE_FLY
+                       // projectiles detonate on impact. If they continue
+                       // moving, we might still be ticrate dependent.
+               else
+                       Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy);
                if(!(self.move_flags & FL_ONGROUND))
                        self.angles = vectoangles(self.velocity);
        }

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

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

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

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