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

Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare

Browse source
This commit is contained in:
Seth Alves 2015-02-20 14:30:35 -08:00
commit bbb6e048f5
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/entityScripts/portal.js
View file

@ -1,6 +1,7 @@
(function(){ (function(){
var teleport; var teleport;
var portalDestination; var portalDestination;
var animationURL;
function playSound() { function playSound() {
Audio.playSound(teleport, { volume: 0.40, localOnly: true }); Audio.playSound(teleport, { volume: 0.40, localOnly: true });
@ -11,6 +12,7 @@
var properties = Entities.getEntityProperties(entityID); var properties = Entities.getEntityProperties(entityID);
portalDestination = properties.userData; portalDestination = properties.userData;
animationURL = properties.modelURL;
print("The portal destination is " + portalDestination); print("The portal destination is " + portalDestination);
} }
@ -25,7 +27,7 @@
this.leaveEntity = function(entityID) { this.leaveEntity = function(entityID) {
Entities.editEntity(entityID, { Entities.editEntity(entityID, {
animationURL: "http://hifi-public.s3.amazonaws.com/models/content/phonebooth.fbx", animationURL: animationURL,
animationSettings: '{ "frameIndex": 1, "running": false }' animationSettings: '{ "frameIndex": 1, "running": false }'
}); });
@ -34,7 +36,7 @@
this.hoverEnterEntity = function(entityID) { this.hoverEnterEntity = function(entityID) {
Entities.editEntity(entityID, { Entities.editEntity(entityID, {
animationURL: "http://hifi-public.s3.amazonaws.com/models/content/phonebooth.fbx", animationURL: animationURL,
animationSettings: '{ "fps": 24, "firstFrame": 1, "lastFrame": 25, "frameIndex": 1, "running": true, "hold": true }' animationSettings: '{ "fps": 24, "firstFrame": 1, "lastFrame": 25, "frameIndex": 1, "running": true, "hold": true }'
}); });
}; };

2
examples/libraries/entityCameraTool.js
View file

@ -477,7 +477,7 @@ CameraManager = function() {
// Last mode that was first or third person // Last mode that was first or third person
var lastAvatarCameraMode = "first person"; var lastAvatarCameraMode = "first person";
Camera.modeUpdated.connect(function(newMode) { Camera.modeUpdated.connect(function(newMode) {
if (newMode == "first person" || newMode == "third person") { if (newMode != "independent") {
lastAvatarCameraMode = newMode; lastAvatarCameraMode = newMode;
that.disable(true); that.disable(true);
} else { } else {

2
examples/notifications.js
View file

@ -84,7 +84,7 @@ var users = [];
var ctrlIsPressed = false; var ctrlIsPressed = false;
var ready = true; var ready = true;
var randomSounds = new SoundArray({}, true); var randomSounds = new SoundArray({ localOnly: true }, true);
var numberOfSounds = 2; var numberOfSounds = 2;
for (var i = 1; i <= numberOfSounds; i++) { for (var i = 1; i <= numberOfSounds; i++) {
randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/notification-general" + i + ".raw"); randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/notification-general" + i + ".raw");