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

Merge pull request #5746 from imgntn/bubblewand_hotfix_1

Browse source 
Run cleanup when createWand.js ends; Don't delete bubbles on collision (for now)
This commit is contained in:
Brad Hefta-Gaub 2015-09-08 18:18:36 -07:00
commit ae8c3a19ed
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/toys/bubblewand/bubble.js
View file

@ -26,7 +26,7 @@
this.collisionWithEntity = function(myID, otherID, collision) {
//if(Entites.getEntityProperties(otherID).userData.objectType==='') { merge bubbles?}
Entities.deleteEntity(myID);
// Entities.deleteEntity(myID);
// this.burstBubbleSound(collision.contactPoint)
};

2
examples/toys/bubblewand/createWand.js
View file

@ -35,7 +35,7 @@ var wand = Entities.addEntity({
});
function cleanup() {
//Entities.deleteEntity(wand);
Entities.deleteEntity(wand);
}