Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 04:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33694 commits 71 branches 56 tags 1.2 GiB
Commit graph

33694 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
2fba3c75e7 Merge pull request #6167 from jherico/c3 
Conditional support from JS
 2015-10-23 17:43:19 -07:00
Brad Hefta-Gaub
4817964739 Merge pull request #6166 from jherico/controllers 
Moving conditionals and endpoints out of UserInputMapper
 2015-10-23 17:40: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 Davis
d5425ac625 Moving conditionals and endpoints out of UserInputMapper 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-23 17:24:03 -07:00
Brad Davis
0fdd32709f Moving conditionals and endpoints out of UserInputMapper 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-23 17:22:46 -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
2c2273df0b Merge pull request #6160 from AlessandroSigna/controllers 
Fix paddleBall.js
 2015-10-23 17:00:06 -07:00
Brad Hefta-Gaub
6b795364c8 make handGrab treat shoulder bumbers and triggers as merged control 2015-10-23 16:30: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