samcake
|
eae316100a
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-23 18:18:27 -07:00 |
|
samcake
|
d400c694f6
|
Cleaning up for release
|
2015-10-23 18:09:54 -07:00 |
|
Brad Davis
|
304fe49628
|
Merge pull request #6170 from ZappoMan/fixScripts
various controller script updates
|
2015-10-23 17:43:54 -07:00 |
|
Brad Hefta-Gaub
|
060f87d14a
|
CR feedback
|
2015-10-23 17:33:45 -07:00 |
|
samcake
|
be843a0035
|
adding a rnning average on the velocity values returned by the hydra and adding a simple js to test
|
2015-10-23 17:32:54 -07:00 |
|
Brad Hefta-Gaub
|
9aaef9aabd
|
fix hydraPaint.js to use new API
|
2015-10-23 17:32:06 -07:00 |
|
Brad Davis
|
4e6f64833f
|
Conditional support from JS
|
2015-10-23 17:24:04 -07:00 |
|
Brad Hefta-Gaub
|
9ba1b800d9
|
CR feedback
|
2015-10-23 17:15:39 -07:00 |
|
Brad Hefta-Gaub
|
090dc5409b
|
CR feedback
|
2015-10-23 17:14:59 -07:00 |
|
Brad Hefta-Gaub
|
ed20e7d209
|
CR feedback
|
2015-10-23 17:14:13 -07:00 |
|
Brad Hefta-Gaub
|
9285cf8e2c
|
fix hydraGrabHockey.js to use new API
|
2015-10-23 17:12:26 -07:00 |
|
Brad Hefta-Gaub
|
6b795364c8
|
make handGrab treat shoulder bumbers and triggers as merged control
|
2015-10-23 16:30: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
|
4c14cd757b
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-23 13:47:16 -07:00 |
|
Brad Davis
|
56deef9d6e
|
Moving omniTool to a route mapped input
|
2015-10-23 13:40:36 -07:00 |
|
Brad Davis
|
be148686a7
|
Fixing omnitool
|
2015-10-23 13:40:36 -07:00 |
|
Brad Davis
|
d83ad7fdc1
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-23 13:35:24 -07:00 |
|
AlessandroSigna
|
c2078aca3f
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-23 11:27:16 -07:00 |
|
EdgarPironti
|
5bae83173c
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-23 11:16:02 -07:00 |
|
James B. Pollack
|
6392b7080b
|
move scripts no longer in toybox to better locations
|
2015-10-23 10:36:32 -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 |
|
EdgarPironti
|
eaaec516c2
|
fix controllerExample
|
2015-10-22 18:41:57 -07:00 |
|
Brad Davis
|
103fe3c545
|
Merge pull request #6155 from ZappoMan/fixScripts
fix airGuitar.js
|
2015-10-22 18:19:26 -07:00 |
|
samcake
|
3e4bada313
|
remove uneeded var
|
2015-10-22 18:03:47 -07:00 |
|
samcake
|
9015e98b70
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-22 16:13:54 -07:00 |
|
samcake
|
0ad4634eac
|
Check that the velocity information is passed correctly and fixed clap.js
|
2015-10-22 16:13:12 -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 |
|
Brad Davis
|
5227c40298
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-22 12:15:41 -07:00 |
|
samcake
|
2ebf862da9
|
Merge pull request #6148 from jherico/controllerFunctions
Fixing controller functions & makeAxis
|
2015-10-22 11:56:58 -07:00 |
|
EdgarPironti
|
09cdc01599
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-22 11:50:45 -07:00 |
|
Brad Davis
|
7ed9ed8500
|
Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS
make handControllerGrab.js work with new API
|
2015-10-22 11:40:48 -07:00 |
|
Brad Davis
|
6cf0bdcffe
|
Testing function destination and fixing bug in rule ordering for multi-soure
|
2015-10-22 10:00:11 -07:00 |
|
Brad Davis
|
5d4cbfdacb
|
Resolving ambiguity between functions and inputs differently
|
2015-10-22 09:50:24 -07:00 |
|
Brad Davis
|
4938e5ea84
|
Fixing function based routes, makeAxis
|
2015-10-22 09:50:23 -07:00 |
|
Brad Hefta-Gaub
|
3e7364608b
|
make handControllerGrab.js work with new API
|
2015-10-22 09:17:29 -07:00 |
|
Brad Davis
|
637654adea
|
Wiring up step yaw
|
2015-10-21 18:46:09 -07:00 |
|
EdgarPironti
|
f3dd529a5f
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-21 15:02:40 -07:00 |
|
Brad Hefta-Gaub
|
d865eb2e24
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-21 12:46:26 -07:00 |
|
James B. Pollack
|
384a6a8154
|
rename /toys to /toybox, remove non toybox scripts, update master refs
|
2015-10-21 11:36:49 -07:00 |
|
Eric Levin
|
970d189262
|
Merge pull request #6125 from imgntn/toybox_ac
[Scripts] Add Toybox AC Scripts, cleanup their headers, organize
|
2015-10-21 11:24:59 -07:00 |
|
James B. Pollack
|
0b06cf1dfb
|
cleanup
|
2015-10-21 10:53:32 -07:00 |
|
James B. Pollack
|
68d43dc576
|
reduce number of toybox sound scripts
|
2015-10-21 10:50:37 -07:00 |
|
Brad Davis
|
21a3079a39
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-21 10:05:32 -07:00 |
|
James B. Pollack
|
80fb12b1a4
|
Merge branch 'master' into toybox_ac
|
2015-10-21 09:58:49 -07:00 |
|
Brad Hefta-Gaub
|
6465bb85dd
|
Merge pull request #6124 from imgntn/bball_fixes
[Scripts] Fix Basketball Solidity in Toybox
|
2015-10-21 09:11:12 -07:00 |
|