Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 01:23:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bugs

Browse source
This commit is contained in:
Andrew Meadows 2016-01-07 13:40:24 -08:00
parent e1ba4ff0a8
commit c9b125612c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketType::EntityAdd: case PacketType::EntityAdd:
case PacketType::EntityEdit: case PacketType::EntityEdit:
case PacketType::EntityData: case PacketType::EntityData:
return VERSION_ENTITITES_HAVE_QUERY_BOX; return VERSION_ENTITITES_HAVE_COLLISION_MASK;
case PacketType::AvatarData: case PacketType::AvatarData:
case PacketType::BulkAvatarData: case PacketType::BulkAvatarData:
return static_cast<PacketVersion>(AvatarMixerPacketVersion::SoftAttachmentSupport); return static_cast<PacketVersion>(AvatarMixerPacketVersion::SoftAttachmentSupport);

3
libraries/physics/src/EntityMotionState.cpp
View file

@ -623,6 +623,9 @@ void EntityMotionState::computeCollisionGroupAndMask(int16_t& group, int16_t& ma
case MOTION_TYPE_KINEMATIC: case MOTION_TYPE_KINEMATIC:
group = BULLET_COLLISION_GROUP_KINEMATIC; group = BULLET_COLLISION_GROUP_KINEMATIC;
break; break;
case MOTION_TYPE_DYNAMIC:
group = BULLET_COLLISION_GROUP_DYNAMIC;
break;
default: default:
break; break;
} }