Commit graph

80 commits

Author SHA1 Message Date
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
Anthony J. Thibault
75b3523c33 Simplify grab animation logic
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js

Deleted old hydra/squeezeHands.js to avoid confusion.

Added new sqeezeHands.js script to the default scripts.
2016-01-13 17:57:51 -08:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns
Controller Branch - Fix gun.js
2015-10-26 10:51:08 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
3e50174114 Updating gun.js to new controller API 2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub
394511ac1b fix frisbee.js to work with new API 2015-10-24 09:50:09 -07:00
Brad Hefta-Gaub
6cffe8cb6a Merge pull request #6169 from EdgarPironti/controllers2
fix toyball.js
2015-10-23 20:21:00 -07:00
EdgarPironti
0959c98132 Fixed tab 2015-10-23 17:26:44 -07:00
EdgarPironti
c64290b5cd Removed unused variables 2015-10-23 17:13:29 -07:00
EdgarPironti
5c09391170 fix toyball.js 2015-10-23 16:19:40 -07:00
AlessandroSigna
5d8d8c8f0d Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 15:50:39 -07:00
AlessandroSigna
37e1e43ce0 Fix paddleBall.js 2015-10-23 15:48:29 -07:00
Brad Hefta-Gaub
7e3192d0f6 fix drumstick.js
fix drumstick.js
2015-10-23 14:22:50 -07:00
AlessandroSigna
6001968d92 Fix paddleBall.js 2015-10-23 13:52:22 -07:00
AlessandroSigna
c2078aca3f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 11:27:16 -07:00
Brad Davis
63df9fb959 Fixing raw sound playback and air guitar 2015-10-22 22:37:18 -07:00
AlessandroSigna
ae2f7f6ff6 Fix paddleBall.js 2015-10-22 18:50:23 -07:00
Brad Davis
103fe3c545 Merge pull request #6155 from ZappoMan/fixScripts
fix airGuitar.js
2015-10-22 18:19:26 -07:00
samcake
2db87e0d2d Remove hydramove.js and expose the velocity and angular Velocity for hydra 2015-10-22 15:55:36 -07:00
Brad Hefta-Gaub
c826b48c92 fix airGuitar.js 2015-10-22 15:05:59 -07:00
ericrius1
7133fc94f5 hydraGrab now grabs entities based on how they want to be grabbed (through setting of userData field with a key called spatialKey 2015-09-08 12:54:02 -07:00
ericrius1
ebe5818c84 relative path 2015-09-03 14:09:01 -07:00
ericrius1
fa42334430 added userData manipulations to grab script 2015-09-03 11:30:44 -07:00
ericrius1
d303c7e119 only add actions to physical objects 2015-09-02 16:45:50 -07:00
ericrius1
1e6198cf59 update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js 2015-09-02 11:29:37 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Howard Stearns
5114f82dca Fix https://app.asana.com/0/32622044445063/38213714069516 2015-06-23 12:07:01 -07:00
ericrius1
cf579ab275 fixed bullet size to be smaller 2015-06-23 09:52:29 -07:00
Howard Stearns
e6bafb9bf1 Draggable toolBar.js, with persistence, and update some scripts for it. 2015-06-11 16:19:54 -07:00
Howard Stearns
d214f128cd Miniumum change for gun to use per-entity collisions.
I have *not* updated this script for other recent changes (e.g., to entityIDs).
2015-05-25 17:39:15 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Eric Levin
7a12a4d58e added support for both right and left hydras for hydra scripts, and made picking accurate 2015-05-14 17:00:40 -07:00
Eric Levin
ebb590e58a added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script 2015-05-14 11:46:52 -07:00
Thijs Wenker
bd8ea7bfc0 Merge branch 'master' of github.com:PhilipRosedale/hifi into 20423
Conflicts:
	examples/controllers/hydra/gun.js
2015-04-01 19:13:46 +02:00
Thijs Wenker
f22c739642 updated gunscript 2015-04-01 16:26:55 +02:00
Philip Rosedale
9642bd199d Buttons at bottom 2015-03-31 22:12:06 -07:00
Philip Rosedale
b7f0be761c gun buildings fall on creation, dice stops correctly 2015-03-31 16:27:09 -07:00
Philip Rosedale
182a1a726d remove debug 2015-03-10 13:34:16 -07:00
Philip Rosedale
2d6c51ac77 Detect moving objects before catching them 2015-03-10 13:32:56 -07:00
Andrew Meadows
5b854857c1 fix JS scripts to use radians per second
in entity properties
2015-03-07 18:02:41 -08:00
Philip Rosedale
9d021a1a1e remove unused line 2015-02-24 11:49:12 -08:00
Philip Rosedale
7489b468f3 give angular velocity to the thrown ball 2015-02-24 11:48:35 -08:00
Stephen Birarda
70e085009b use injector restart in airGuitar script 2015-02-12 11:44:14 -08:00
Stephen Birarda
05b7cd819e use isPlaying property instead of getter 2015-02-11 16:21:45 -08:00
Stephen Birarda
d8646f6ea0 repairs for new injector API in air guitar script 2015-02-11 16:17:10 -08:00
Philip Rosedale
0c3f4b894c Menu for handedness, that really works. 2015-01-29 10:53:50 -08:00
Philip Rosedale
a85c6aa956 fix tabs? 2015-01-28 09:49:45 -08:00
Philip Rosedale
b515a0468b Merge branch 'master' of https://github.com/worklist/hifi 2015-01-28 09:35:07 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches
Some physics improvements
2015-01-27 13:02:11 -08:00
Philip Rosedale
e8f4783bea border, new size for blocks, smoother hydra grab action 2015-01-26 22:06:59 -08:00