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

Merge pull request #6509 from ericrius1/toyboxFixes

Browse source 
Toybox Tweaking
This commit is contained in:
James B. Pollack 2015-12-01 13:07:10 -08:00
commit 3c8e31cd42
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/toybox/doll/doll.js
View file

@ -36,14 +36,10 @@
Entities.editEntity(this.entityID, {
animation: {
url: "https://hifi-public.s3.amazonaws.com/models/Bboys/zombie_scream.fbx",
currentFrame: 0
running: true
}
});
Entities.editEntity(_this.entityID, {
animationIsPlaying: true
});
var position = Entities.getEntityProperties(this.entityID, "position").position;
this.audioInjector = Audio.playSound(this.screamSounds[randInt(0, this.screamSounds.length)], {
position: position,
@ -67,8 +63,10 @@
this.audioInjector.stop();
Entities.editEntity(this.entityID, {
animation: {
url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
currentFrame: 0
// Providing actual model fbx for animation used to work, now contorts doll into a weird ball
// See bug: https://app.asana.com/0/26225263936266/70097355490098
// url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
running: false,
}
});

9
unpublishedScripts/hiddenEntityReset.js
View file

@ -132,11 +132,12 @@
createLights();
createCat({
x: 551.09,
y: 494.98,
z: 503.49
x: 551.0,
y: 495.3,
z: 503.3
});
createSprayCan({
x: 549.7,
y: 495.6,
@ -1187,7 +1188,7 @@
shapeType: 'box',
gravity: {
x: 0,
y: -0.5,
y: -3.0,
z: 0
},
velocity: {

8
unpublishedScripts/masterReset.js
View file

@ -110,9 +110,9 @@ MasterReset = function() {
createCat({
x: 551.09,
y: 494.98,
z: 503.49
x: 551.0,
y: 495.3,
z: 503.3
});
createSprayCan({
@ -1168,7 +1168,7 @@ MasterReset = function() {
shapeType: 'box',
gravity: {
x: 0,
y: -0.5,
y: -3.0,
z: 0
},
velocity: {