mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 04:48:54 +02:00
merge upstream/master into andrew/inertia
This commit is contained in:
commit
081037bc5f
4 changed files with 8 additions and 9 deletions
|
@ -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);
|
MyAvatar.attach(HELMET_ATTACHMENT_URL, "Neck", {x: 0, y: 0, z: 0}, Quat.fromPitchYawRollDegrees(0, 0, 0), 1.15);
|
||||||
|
|
||||||
// start the drone sound
|
// 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
|
// start one of our muzak sounds
|
||||||
playRandomMuzak();
|
// playRandomMuzak();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -353,9 +353,9 @@ function update(deltaTime) {
|
||||||
Overlays.editOverlay(descriptionText, { position: textOverlayPosition() });
|
Overlays.editOverlay(descriptionText, { position: textOverlayPosition() });
|
||||||
|
|
||||||
// if the reticle is up then we may need to play the next muzak
|
// if the reticle is up then we may need to play the next muzak
|
||||||
if (!Audio.isInjectorPlaying(currentMuzakInjector)) {
|
// if (!Audio.isInjectorPlaying(currentMuzakInjector)) {
|
||||||
playNextMuzak();
|
// playNextMuzak();
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -98,9 +98,7 @@ void EntityTreeRenderer::init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItemID) {
|
QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItemID) {
|
||||||
_tree->lockForRead();
|
|
||||||
EntityItem* entity = static_cast<EntityTree*>(_tree)->findEntityByEntityItemID(entityItemID);
|
EntityItem* entity = static_cast<EntityTree*>(_tree)->findEntityByEntityItemID(entityItemID);
|
||||||
_tree->unlock();
|
|
||||||
return loadEntityScript(entity);
|
return loadEntityScript(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,8 @@ bool DeleteEntityOperator::preRecursion(OctreeElement* element) {
|
||||||
// and we can stop searching.
|
// and we can stop searching.
|
||||||
if (entityTreeElement == details.containingElement) {
|
if (entityTreeElement == details.containingElement) {
|
||||||
EntityItem* theEntity = details.entity;
|
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
|
_tree->setContainingElement(details.entity->getEntityItemID(), NULL); // update or id to element lookup
|
||||||
_foundCount++;
|
_foundCount++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -239,7 +239,7 @@ bool UpdateEntityOperator::preRecursion(OctreeElement* element) {
|
||||||
|
|
||||||
if (oldElement != _containingElement) {
|
if (oldElement != _containingElement) {
|
||||||
qDebug() << "WARNING entity moved during UpdateEntityOperator recursion";
|
qDebug() << "WARNING entity moved during UpdateEntityOperator recursion";
|
||||||
assert(! _containingElement->removeEntityItem(_existingEntity));
|
_containingElement->removeEntityItem(_existingEntity);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_wantDebug) {
|
if (_wantDebug) {
|
||||||
|
|
Loading…
Reference in a new issue