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

33664 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Brad Davis
e40741b5cb Removing overrides / loopback support, adding route debugging 2015-10-22 15:52:10 -07:00
Brad Davis
d1da2f5aab Adding more items to the standard controller abstraction 2015-10-22 15:51:09 -07:00
Brad Davis
8c163a52e9 Attempting to fix log graphs 2015-10-22 15:49:58 -07:00
Brad Davis
471f43899d Moving aliases / bisected versions below main actions 2015-10-22 15:49:27 -07:00
Brad Hefta-Gaub
c826b48c92 fix airGuitar.js 2015-10-22 15:05:59 -07:00
James B. Pollack
cd2559f1cc Merge pull request #6153 from ZappoMan/addKeyholeRadiusToEntityViewer 
Add Ability to set keyhole radius on EntityViewer
 2015-10-22 14:06:07 -07:00
Brad Hefta-Gaub
ea917f85f4 added ability to set keyhole radius on EntityViewer 2015-10-22 12:56:45 -07:00
Brad Hefta-Gaub
4a7f5751f4 Merge pull request #6151 from samcake/color 
Fix the dark diffuse color for material without texture
 2015-10-22 12:23:41 -07:00
Brad Davis
5227c40298 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-22 12:15:41 -07:00
samcake
b2461a8e4e Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-22 12:06:20 -07:00
samcake
2ebf862da9 Merge pull request #6148 from jherico/controllerFunctions 
Fixing controller functions & makeAxis
 2015-10-22 11:56:58 -07:00
Brad Davis
0755ba8ba4 Merge pull request #6150 from birarda/qt-5.5 
final fixes required for successful Qt 5.5.1 build
 2015-10-22 11:51:15 -07:00
EdgarPironti
09cdc01599 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-22 11:50:45 -07:00
samcake
a44ac4cbfd Fiing the dark colors for surfaces without texture 2015-10-22 11:40:56 -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 Hefta-Gaub
67f2a0c6c8 CR feedback on mappings 2015-10-22 11:39:51 -07:00
Stephen Birarda
a8d591166e Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5 2015-10-22 11:13:28 -07:00
Stephen Birarda
695f0a75b0 fixes for builds with qt 5.5 2015-10-22 11:12:51 -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
7c746462fa Merge pull request #6147 from jherico/controllers 
Controllers Branch - Wiring up step yaw
 2015-10-22 09:45:55 -07:00