Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 22:47:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6137 from sethalves/fix-kinematic-grab

Browse source 
Fix kinematic hold-action transmission
This commit is contained in:
Brad Hefta-Gaub 2015-10-21 12:44:05 -07:00
commit 8f90cdf98c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/AvatarActionHold.cpp
View file

@ -245,6 +245,8 @@ QByteArray AvatarActionHold::serialize() const {
dataStream << _expires + getEntityServerClockSkew(); dataStream << _expires + getEntityServerClockSkew();
dataStream << _tag; dataStream << _tag;
dataStream << _kinematic;
dataStream << _kinematicSetVelocity;
}); });
return serializedActionArguments; return serializedActionArguments;
@ -278,6 +280,8 @@ void AvatarActionHold::deserialize(QByteArray serializedArguments) {
dataStream >> _expires; dataStream >> _expires;
_expires -= getEntityServerClockSkew(); _expires -= getEntityServerClockSkew();
dataStream >> _tag; dataStream >> _tag;
dataStream >> _kinematic;
dataStream >> _kinematicSetVelocity;
#if WANT_DEBUG #if WANT_DEBUG
qDebug() << "deserialize AvatarActionHold: " << _holderID qDebug() << "deserialize AvatarActionHold: " << _holderID