merge upstream/master into andrew/bispinor

Conflicts:
	libraries/physics/src/EntityMotionState.cpp
This commit is contained in:
Andrew Meadows 2015-01-16 15:22:06 -08:00
commit 840acecbe6

View file

@ -154,6 +154,9 @@ float EntityMotionState::computeMass(const ShapeInfo& shapeInfo) const {
}
void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame) {
if (!_entity->isKnownID()) {
return; // never update entities that are unknown
}
if (_outgoingPacketFlags) {
EntityItemProperties properties = _entity->getProperties();