Merge remote branch 'refs/remotes/origin/diabolik/seraphinaplayermodel'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:08:23 +0000 (20:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:08:23 +0000 (20:08 +0200)
models/player/ignis.iqm
models/player/ignis.iqm_0.tga
models/player/ignishalfmasked.iqm
models/player/ignishalfmasked.iqm_0.tga
models/player/ignismasked.iqm
models/player/ignismasked.iqm_0.tga
models/player/pyria.iqm_0.tga
models/player/umbra.iqm_0.tga
qcsrc/client/projectile.qc

index aefdc83..cccb00c 100644 (file)
Binary files a/models/player/ignis.iqm and b/models/player/ignis.iqm differ
index 177b4a6..9905384 100644 (file)
Binary files a/models/player/ignis.iqm_0.tga and b/models/player/ignis.iqm_0.tga differ
index 017485a..5a823e2 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm and b/models/player/ignishalfmasked.iqm differ
index f1aecb2..c0beb4a 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm_0.tga and b/models/player/ignishalfmasked.iqm_0.tga differ
index df34e30..a165aac 100644 (file)
Binary files a/models/player/ignismasked.iqm and b/models/player/ignismasked.iqm differ
index 8e22e63..572e8fe 100644 (file)
Binary files a/models/player/ignismasked.iqm_0.tga and b/models/player/ignismasked.iqm_0.tga differ
index 7b81093..b155a57 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ
index 726d329..d3b3cc4 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ
index b67cc76..e1f325a 100644 (file)
@@ -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);
        }