mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 01:24:03 +02:00
temp fix for doll, moved cat
This commit is contained in:
parent
d80bfc0af6
commit
a3f8c52aa3
3 changed files with 13 additions and 14 deletions
|
@ -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:
|
||||
// url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
|
||||
running: false,
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -82,4 +80,4 @@
|
|||
};
|
||||
// entity scripts always need to return a newly constructed object of our type
|
||||
return new Doll();
|
||||
});
|
||||
});
|
|
@ -125,11 +125,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,
|
||||
|
|
|
@ -102,9 +102,9 @@ MasterReset = function() {
|
|||
|
||||
|
||||
createCat({
|
||||
x: 551.09,
|
||||
y: 494.98,
|
||||
z: 503.49
|
||||
x: 551.0,
|
||||
y: 495.3,
|
||||
z: 503.3
|
||||
});
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue