Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 05:53:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge upstream/master into andrew/inertia

Browse source
This commit is contained in:
Andrew Meadows 2015-01-12 12:34:50 -08:00
commit 081037bc5f
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/lobby.js
View file

@ -139,10 +139,10 @@ function drawLobby() {
MyAvatar.attach(HELMET_ATTACHMENT_URL, "Neck", {x: 0, y: 0, z: 0}, Quat.fromPitchYawRollDegrees(0, 0, 0), 1.15);
// start the drone sound
currentDrone = Audio.playSound(droneSound, { stereo: true, loop: true, localOnly: true, volume: DRONE_VOLUME });
// currentDrone = Audio.playSound(droneSound, { stereo: true, loop: true, localOnly: true, volume: DRONE_VOLUME });
// start one of our muzak sounds
playRandomMuzak();
// playRandomMuzak();
}
}
@ -353,9 +353,9 @@ function update(deltaTime) {
Overlays.editOverlay(descriptionText, { position: textOverlayPosition() });
// if the reticle is up then we may need to play the next muzak
if (!Audio.isInjectorPlaying(currentMuzakInjector)) {
playNextMuzak();
}
// if (!Audio.isInjectorPlaying(currentMuzakInjector)) {
// playNextMuzak();
// }
}
}

2
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -98,9 +98,7 @@ void EntityTreeRenderer::init() {
}
QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItemID) {
_tree->lockForRead();
EntityItem* entity = static_cast<EntityTree*>(_tree)->findEntityByEntityItemID(entityItemID);
_tree->unlock();
return loadEntityScript(entity);
}

3
libraries/entities/src/DeleteEntityOperator.cpp
View file

@ -92,7 +92,8 @@ bool DeleteEntityOperator::preRecursion(OctreeElement* element) {
// and we can stop searching.
if (entityTreeElement == details.containingElement) {
EntityItem* theEntity = details.entity;
assert(entityTreeElement->removeEntityItem(theEntity)); // remove it from the element
bool entityDeleted = entityTreeElement->removeEntityItem(theEntity); // remove it from the element
assert(entityDeleted);
_tree->setContainingElement(details.entity->getEntityItemID(), NULL); // update or id to element lookup
_foundCount++;
}

2
libraries/entities/src/UpdateEntityOperator.cpp
View file

@ -239,7 +239,7 @@ bool UpdateEntityOperator::preRecursion(OctreeElement* element) {
if (oldElement != _containingElement) {
qDebug() << "WARNING entity moved during UpdateEntityOperator recursion";
assert(! _containingElement->removeEntityItem(_existingEntity));
_containingElement->removeEntityItem(_existingEntity);
}
if (_wantDebug) {