Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bump protocol version

Browse source
This commit is contained in:
Seth Alves 2016-05-07 17:48:06 -07:00
parent 91ff851bf8
commit 46c1049a35
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/avatars/src/AvatarData.cpp
View file

@ -956,6 +956,7 @@ void AvatarData::clearJointsData() {
} }
bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray& data) { bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray& data) {
// this is used by the avatar-mixer
QDataStream packetStream(data); QDataStream packetStream(data);
QUuid avatarUUID; QUuid avatarUUID;

1
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -107,6 +107,7 @@ void AvatarHashMap::processAvatarDataPacket(QSharedPointer<ReceivedMessage> mess
} }
void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) { void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) {
// this is used by clients
// setup a data stream to parse the packet // setup a data stream to parse the packet
QDataStream identityStream(message->getMessage()); QDataStream identityStream(message->getMessage());

2
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -50,7 +50,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
return VERSION_LIGHT_HAS_FALLOFF_RADIUS; return VERSION_LIGHT_HAS_FALLOFF_RADIUS;
case PacketType::AvatarData: case PacketType::AvatarData:
case PacketType::BulkAvatarData: case PacketType::BulkAvatarData:
return static_cast<PacketVersion>(AvatarMixerPacketVersion::SoftAttachmentSupport); return static_cast<PacketVersion>(AvatarMixerPacketVersion::AvatarEntities);
case PacketType::ICEServerHeartbeat: case PacketType::ICEServerHeartbeat:
return 18; // ICE Server Heartbeat signing return 18; // ICE Server Heartbeat signing
case PacketType::AssetGetInfo: case PacketType::AssetGetInfo:

3
libraries/networking/src/udt/PacketHeaders.h
View file

@ -174,7 +174,8 @@ const PacketVersion VERSION_LIGHT_HAS_FALLOFF_RADIUS = 57;
enum class AvatarMixerPacketVersion : PacketVersion { enum class AvatarMixerPacketVersion : PacketVersion {
TranslationSupport = 17, TranslationSupport = 17,
SoftAttachmentSupport SoftAttachmentSupport,
AvatarEntities
}; };
#endif // hifi_PacketHeaders_h #endif // hifi_PacketHeaders_h