Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 12:07:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34009 commits 25 branches 0 tags 1.1 GiB
Commit graph

34009 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
7b0b77f4d1 getAvatarHash => withAvatarHash 2015-10-23 16:57:27 -07:00
Howard Stearns
c2a4aab7c3 Merge branch 'master' of https://github.com/highfidelity/hifi into safe-avatar-list-access 2015-10-23 16:52:42 -07:00
Brad Hefta-Gaub
6b795364c8 make handGrab treat shoulder bumbers and triggers as merged control 2015-10-23 16:30:40 -07:00
EdgarPironti
5c09391170 fix toyball.js 2015-10-23 16:19:40 -07:00
Brad Davis
548dcde335 Merge pull request #6168 from ZappoMan/fixScripts 
fix AnyEndpoint support from JS
 2015-10-23 16:16:51 -07:00
Brad Hefta-Gaub
d5a90e273e fix AnyEndpoint support from JS 2015-10-23 15:56:55 -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
samcake
bffce7b92c Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 15:03:37 -07:00
samcake
f14a321d03 Adding a amoving Average for the velocity of the hydra 2015-10-23 15:03:04 -07:00
Brad Davis
7522659767 Merge pull request #6165 from ZappoMan/fixScripts 
Fix drumstick.js
 2015-10-23 14:26:02 -07:00
Brad Hefta-Gaub
7e3192d0f6 fix drumstick.js 
fix drumstick.js
 2015-10-23 14:22:50 -07:00
Brad Hefta-Gaub
e0211e4b0a Merge pull request #6162 from jherico/controllers 
Controllers Branch - Fixing omnitool
 2015-10-23 13:54:14 -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
54c20a8dd7 Taking a different tack on proper ordering of routes 2015-10-23 13:40:38 -07:00
Brad Davis
4110324b35 Add another bit to channel types so we can fit rumble 2015-10-23 13:40:37 -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
e8be92cab8 Adding input action event 2015-10-23 13:36:06 -07:00
Brad Davis
d83ad7fdc1 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-23 13:35:24 -07:00
Brad Davis
a1f14cbf83 Merge pull request #6164 from ZappoMan/exposeMyAvatarHandsToJS 
expose MyAvatar.xxxHandPose to JS
 2015-10-23 13:17:40 -07:00
Brad Hefta-Gaub
f90844449d fix angular velocity 2015-10-23 13:16:05 -07:00
Brad Hefta-Gaub
9356a253c1 Merge pull request #6159 from EdgarPironti/controllers 
Fix controllerExample.js
 2015-10-23 12:27:47 -07:00
Brad Hefta-Gaub
5cf936f132 Merge pull request #6163 from imgntn/move_files 
[Scripts] Move scripts no longer in toybox to better locations
 2015-10-23 12:26:38 -07:00
Brad Hefta-Gaub
4a58eeb810 expose deltaRotation as part of MyAvatar.xxxHandPose 2015-10-23 12:14:33 -07:00
Brad Hefta-Gaub
71dfff7c35 first cut at adding MyAvatar.xxxHandPose 2015-10-23 12:00:40 -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
30b44d1e33 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-23 09:22:19 -07:00
Brad Hefta-Gaub
816cf3d516 Merge pull request #6161 from jherico/controllers 
Fix hand poses, air guitar chord and instrument changing and RAW sound file playback.
 2015-10-23 08:59:30 -07:00
Brad Davis
63df9fb959 Fixing raw sound playback and air guitar 2015-10-22 22:37:18 -07:00
Brad Davis
91804fbc04 Fix ordering of standard vs device routes 2015-10-22 22:02:09 -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
Brad Davis
79426f8679 Merge pull request #6157 from samcake/controllers 
Controllers: Adding the velocity information to the pose coming from the Hydra
 2015-10-22 18:17:16 -07:00
Brad Hefta-Gaub
978d248c9e Merge pull request #6156 from jherico/controllers 
Minor cleanup and fix for broken conditional strafe
 2015-10-22 18:16:47 -07:00
samcake
3e4bada313 remove uneeded var 2015-10-22 18:03:47 -07:00
Howard Stearns
84cfeaec13 Linux QT wants .h-less headers. 2015-10-22 17:01:06 -07:00
howard-stearns
92ddedd44b Make msvc happy. 2015-10-22 16:44:15 -07:00
howard-stearns
7638a58ce9 Merge branch 'expose-anim-vars' of https://github.com/howard-stearns/hifi into expose-anim-vars 2015-10-22 16:29:14 -07:00
Howard Stearns
773e4014ca Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-22 16:26:59 -07:00
Howard Stearns
2b7ceffd64 Get rid of globalObject().property("MyAvatar").property("animationStateHandlerResult"). 2015-10-22 16:23:09 -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
Brad Davis
51c8d48c8c Fix broken conditional caused by invalid route ordering 2015-10-22 16:12:31 -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 Davis
a9aea9b477 Working on TestController display 2015-10-22 15:53:19 -07:00