Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add back manipulation of collidesWith in bow

Browse source
This commit is contained in:
Ryan Huffman 2016-11-30 13:26:56 -08:00
parent 35bc962654
commit 58c232529b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bow/bow/bow.js
View file

@ -142,6 +142,9 @@
} else if (this.hand === 'right') { } else if (this.hand === 'right') {
this.getStringHandPosition = function() { return _this.getControllerLocation("left").position; }; this.getStringHandPosition = function() { return _this.getControllerLocation("left").position; };
} }
Entities.editEntity(_this.entityID, {
collidesWith: "",
});
var data = getEntityCustomData('grabbableKey', this.entityID, {}); var data = getEntityCustomData('grabbableKey', this.entityID, {});
data.grabbable = false; data.grabbable = false;
@ -175,6 +178,9 @@
Entities.deleteEntity(this.arrow); Entities.deleteEntity(this.arrow);
this.resetStringToIdlePosition(); this.resetStringToIdlePosition();
this.destroyArrow(); this.destroyArrow();
Entities.editEntity(_this.entityID, {
collidesWith: "static,dynamic,kinematic,otherAvatar,myAvatar"
});
}, },
destroyArrow: function() { destroyArrow: function() {