mirror of
https://github.com/overte-org/overte.git
synced 2025-08-11 09:48:27 +02:00
updates
This commit is contained in:
parent
1c188a270d
commit
7579102b1a
1 changed files with 19 additions and 1 deletions
|
@ -125,6 +125,18 @@
|
||||||
Entities.deleteEntity(this.arrow);
|
Entities.deleteEntity(this.arrow);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
startNearGrab:function(entityID, args){
|
||||||
|
_this.startEquip(entityID, args);
|
||||||
|
},
|
||||||
|
|
||||||
|
continueNearGrab:function(entityID, args){
|
||||||
|
_this.continueEquip(entityID, args);
|
||||||
|
},
|
||||||
|
|
||||||
|
releaseGrab:function(){
|
||||||
|
_this.releaseEquip();
|
||||||
|
},
|
||||||
|
|
||||||
startEquip: function(entityID, args) {
|
startEquip: function(entityID, args) {
|
||||||
this.hand = args[0];
|
this.hand = args[0];
|
||||||
avatarID = args[1];
|
avatarID = args[1];
|
||||||
|
@ -137,6 +149,9 @@
|
||||||
var data = getEntityCustomData('grabbableKey', this.entityID, {});
|
var data = getEntityCustomData('grabbableKey', this.entityID, {});
|
||||||
data.grabbable = false;
|
data.grabbable = false;
|
||||||
setEntityCustomData('grabbableKey', this.entityID, data);
|
setEntityCustomData('grabbableKey', this.entityID, data);
|
||||||
|
Entities.editEntity(_this.entityID, {
|
||||||
|
collidesWith: ""
|
||||||
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
continueEquip: function(entityID, args) {
|
continueEquip: function(entityID, args) {
|
||||||
|
@ -181,6 +196,9 @@
|
||||||
Entities.deleteEntity(this.arrow);
|
Entities.deleteEntity(this.arrow);
|
||||||
this.aiming = false;
|
this.aiming = false;
|
||||||
this.hasArrowNotched = false;
|
this.hasArrowNotched = false;
|
||||||
|
Entities.editEntity(_this.entityID, {
|
||||||
|
collidesWith: "static,dynamic,kinematic,otherAvatar,myAvatar"
|
||||||
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
createArrow: function() {
|
createArrow: function() {
|
||||||
|
@ -526,4 +544,4 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
return new Bow();
|
return new Bow();
|
||||||
});
|
});
|
Loading…
Reference in a new issue