Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 14:00:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert unintended changes in avatar packager

Browse source
This commit is contained in:
Ryan Huffman 2019-01-03 13:45:00 -08:00
parent 7953507cb8
commit 7ca7e0f234
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -466,7 +466,7 @@ public:
// Don't actually crash in debug builds, in case this apparent deadlock is simply from // Don't actually crash in debug builds, in case this apparent deadlock is simply from
// the developer actively debugging code // the developer actively debugging code
#ifdef NDEBUG #ifdef NDEBUG
//deadlockDetectionCrash(); deadlockDetectionCrash();
#endif #endif
} }
} }

4
interface/src/avatar/AvatarManager.cpp
View file

@ -536,7 +536,6 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
// my avatar. (Other user machines will make a similar analysis and inject sound for their collisions.) // my avatar. (Other user machines will make a similar analysis and inject sound for their collisions.)
if (collision.idA.isNull() || collision.idB.isNull()) { if (collision.idA.isNull() || collision.idB.isNull()) {
auto myAvatar = getMyAvatar(); auto myAvatar = getMyAvatar();
myAvatar->collisionWithEntity(collision);
auto collisionSound = myAvatar->getCollisionSound(); auto collisionSound = myAvatar->getCollisionSound();
if (collisionSound) { if (collisionSound) {
const auto characterController = myAvatar->getCharacterController(); const auto characterController = myAvatar->getCharacterController();
@ -572,8 +571,9 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
auto injector = AudioInjector::playSoundAndDelete(collisionSound, options); auto injector = AudioInjector::playSoundAndDelete(collisionSound, options);
_collisionInjectors.emplace_back(injector); _collisionInjectors.emplace_back(injector);
} }
myAvatar->collisionWithEntity(collision);
return;
} }
return;
} }
} }
} }

9
scripts/system/html/js/entityProperties.js
View file

@ -112,15 +112,6 @@ const GROUPS = [
type: "color", type: "color",
propertyID: "color", propertyID: "color",
}, },
{
label: "Alpha",
type: "",
type: "number",
min: 0,
max: 1,
step: 0.001,
propertyID: "alpha",
},
] ]
}, },
{ {