Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 07:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'baseball' of github.com:birarda/hifi into baseball

Browse source
This commit is contained in:
Atlante45 2015-11-09 13:41:31 -08:00
commit 3228ca6033
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/baseball/bat.js
View file

@ -15,6 +15,9 @@ Script.include("pitching.js");
var pitchingMachine = null;
this.startNearGrab = this.continueNearGrab = function() {
// send the avatar to the baseball location so that they're ready to bat
MyAvatar.location = "/baseball"
if (!pitchingMachine) {
pitchingMachine = getOrCreatePitchingMachine();
Script.update.connect(function(dt) { pitchingMachine.update(dt); });

2
examples/baseball/createBatButton.js
View file

@ -46,7 +46,7 @@
var BAT_MODEL = "atp:c47deaae09cca927f6bc9cca0e8bbe77fc618f8c3f2b49899406a63a59f885cb.fbx";
var BAT_COLLISION_HULL = "atp:9eafceb7510c41d50661130090de7e0632aa4da236ebda84a0059a4be2130e0c.obj";
var SCRIPT_URL = "http://rawgit.com/huffman/hifi/baseball/examples/baseball/bat.js"
var SCRIPT_URL = "http://rawgit.com/birarda/hifi/baseball/examples/baseball/bat.js"
var batUserData = {
grabbableKey: {