13510 commits

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	e8be92cab8	Adding input action event	2015-10-23 13:36:06 -07:00
Brad Hefta-Gaub	f90844449d	fix angular velocity	2015-10-23 13:16:05 -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
Brad Davis	30b44d1e33	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-23 09:22:19 -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
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
samcake	9015e98b70	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-22 16:13:54 -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	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	471f43899d	Moving aliases / bisected versions below main actions	2015-10-22 15:49:27 -07:00
Brad Hefta-Gaub	ea917f85f4	added ability to set keyhole radius on EntityViewer	2015-10-22 12:56:45 -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	a44ac4cbfd	Fiing the dark colors for surfaces without texture	2015-10-22 11:40:56 -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 Davis	637654adea	Wiring up step yaw	2015-10-21 18:46:09 -07:00
Brad Hefta-Gaub	8772b5dbf2	Merge pull request #6143 from jherico/controllers ... Controllers Branch - Cleanup of enums and JS names	2015-10-21 16:24:30 -07:00
Brad Hefta-Gaub	63e6452630	fix hydra left right arm flip	2015-10-21 16:17:58 -07:00
Brad Hefta-Gaub	9b11b2091f	fix hydra left right arm flip	2015-10-21 16:17:11 -07:00
Brad Davis	4a1df286fd	Cleanup of enums and JS names	2015-10-21 15:57:37 -07:00
Brad Hefta-Gaub	60f9b3da85	Merge pull request #6141 from jherico/controllers ... Working on conditional and filter parsing	2015-10-21 15:09:00 -07:00
Brad Davis	b9b03bd842	Working on conditional and filter parsing	2015-10-21 14:40:33 -07:00
Brad Hefta-Gaub	856af8c764	fix EntityItemID dependency	2015-10-21 14:33:12 -07:00
Brad Hefta-Gaub	6bd1e59305	fix CR feedback	2015-10-21 14:31:44 -07:00
Brad Hefta-Gaub	ffd277d4d5	fix EntityItemID dependency	2015-10-21 14:31:17 -07:00
Brad Hefta-Gaub	3eedfd369e	expose the Pose structure to JS	2015-10-21 14:01:18 -07:00
Brad Hefta-Gaub	58e5bff9a1	Merge pull request #6138 from jherico/controllers ... Prevent crash on connecting gamepad	2015-10-21 13:19:09 -07:00
Brad Hefta-Gaub	0aab108729	Merge pull request #6139 from samcake/controllers ... Controllers : Fixing the pose transmission	2015-10-21 13:12:28 -07:00
samcake	feeb4b68a6	merging and fixing the POse transmission bug	2015-10-21 13:07:35 -07:00
Brad Davis	84e2ace0ea	Prevent crash on connecting gamepad	2015-10-21 12:57:48 -07:00
Brad Hefta-Gaub	d865eb2e24	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-21 12:46:26 -07:00
Brad Davis	ac2a60befb	Adding primary/secondary thumb abstraction	2015-10-21 11:16:51 -07:00
Brad Hefta-Gaub	246e46b69a	implement improvement in sphere test	2015-10-21 10:46:50 -07:00
Brad Davis	21a3079a39	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-21 10:05:32 -07:00
Brad Hefta-Gaub	954afe45d3	Merge pull request #6112 from ericrius1/rayPickAdditions ... Moved whitelist and raypicking code out of octree, fixed small bug with polylines	2015-10-21 09:08:56 -07:00
Brad Davis	f0edc302bf	Fixing filters creation	2015-10-20 22:06:08 -07:00
Brad Davis	a124d3b433	Moving to InputEndpoint, fixing build problem	2015-10-20 22:00:16 -07:00
Brad Davis	de57c3b4d6	Merge remote-tracking branch 'upstream/controllers' into controllers ... Conflicts: libraries/controllers/src/controllers/UserInputMapper.cpp	2015-10-20 21:59:00 -07:00
Brad Hefta-Gaub	d34ad2af42	improved findEntities(sphere) to check against Non-AABBox of entities	2015-10-20 21:01:20 -07:00