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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
James B. Pollack 2015-10-09 10:56:06 -07:00
commit 9141ba9335
3 changed files with 2441 additions and 2307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/toys/ping_pong_gun/pingPongGun.js
View file

@ -24,7 +24,7 @@
var RELOAD_THRESHOLD = 0.95;
var GUN_TIP_FWD_OFFSET =-0.35;
var GUN_TIP_UP_OFFSET = 0.040;
var GUN_FORCE = 5;
var GUN_FORCE = 9;
var BALL_RESTITUTION = 0.6;
var BALL_LINEAR_DAMPING = 0.4;
var BALL_GRAVITY = {
@ -168,4 +168,4 @@
// entity scripts always need to return a newly constructed object of our type
return new PingPongGun();
});
});

2409
unpublishedScripts/hiddenEntityReset.js
View file

File diff suppressed because it is too large Load diff

2335
unpublishedScripts/masterReset.js
View file

File diff suppressed because it is too large Load diff