34009 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
EdgarPironti	f3dd529a5f	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-21 15:02:40 -07:00
Andrew Meadows	27c6624f0c	Merge pull request #6142 from ZappoMan/fixEntityItemDependency ... fix EntityItemID dependency	2015-10-21 14:57:07 -07:00
Brad Davis	8cc7527502	Merge pull request #6140 from ZappoMan/poseInJS ... expose the Pose structure to JS	2015-10-21 14:53:34 -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
James B. Pollack	03d740914d	Merge pull request #6136 from imgntn/cleanup_toybox ... [Scripts] Toybox Cleanup & Organization	2015-10-21 13:59:13 -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 Hefta-Gaub	e2984017d0	Merge pull request #6135 from jherico/controllers ... Controllers Branch - Adding primary/secondary thumb abstraction	2015-10-21 12:44:52 -07:00
Brad Hefta-Gaub	8f90cdf98c	Merge pull request #6137 from sethalves/fix-kinematic-grab ... Fix kinematic hold-action transmission	2015-10-21 12:44:05 -07:00
Seth Alves	47d48d8cd1	Merge branch 'master' of github.com:highfidelity/hifi into fix-kinematic-grab	2015-10-21 12:29:35 -07:00
Seth Alves	c0eccca6d3	relay 'kinematic' mode of a hold to other interfaces	2015-10-21 12:29:26 -07:00
James B. Pollack	b302244a08	Merge pull request #6134 from ZappoMan/improveFindEntities ... implement improvement in sphere test	2015-10-21 12:11:20 -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
Brad Davis	ac2a60befb	Adding primary/secondary thumb abstraction	2015-10-21 11:16:51 -07:00
James B. Pollack	f3181054c9	Merge pull request #6133 from ericrius1/grabFixes ... Added wantsTrigger to userData for a couple toys to avoid breakage …	2015-10-21 11:16:35 -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 Hefta-Gaub	246e46b69a	implement improvement in sphere test	2015-10-21 10:46:50 -07:00
ericrius1	1c5dc0374a	Added wantsTrigger to user data for a couple items to avoid breakage with new grab script changes	2015-10-21 10:16:31 -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
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 Hefta-Gaub	6902f5c54f	Merge pull request #6130 from sethalves/grab ... grab script changes	2015-10-21 09:02:41 -07:00
Brad Hefta-Gaub	5466fa1de8	Merge pull request #6128 from jherico/controllers ... Controllers Branch - Get conditional routes working	2015-10-21 09:00:26 -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
Andrew Meadows	a6ee1d0edb	Merge pull request #6132 from ZappoMan/improveFindEntities ... improved findEntities(sphere) to check against Non-AABBox of entities	2015-10-20 21:56:22 -07:00
samcake	053aca2e36	fixing the cast bug on osx	2015-10-20 21:12:46 -07:00
Brad Davis	f71d1a6fb7	Merge pull request #6131 from samcake/controllers ... DO NOT MERGE: Controllers : Adding support for Pose	2015-10-20 21:02:29 -07:00
Brad Hefta-Gaub	d34ad2af42	improved findEntities(sphere) to check against Non-AABBox of entities	2015-10-20 21:01:20 -07:00
Seth Alves	f85ef9267b	oops	2015-10-20 18:29:27 -07:00
Seth Alves	311254c395	require user-data to have wantsTrigger in it before non-colliding calls will happen	2015-10-20 18:26:12 -07:00
samcake	da26d0dee1	Adding the hand poses channels in the controller mapping files	2015-10-20 18:19:44 -07:00
samcake	e0615309bb	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-20 17:48:38 -07:00
Brad Davis	cd940325c2	Merge remote-tracking branch 'upstream/controllers' into controllers	2015-10-20 17:48:29 -07:00
Brad Davis	0e419e3fbb	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-20 17:47:37 -07:00
samcake	6f7719e9e9	Finally getting the merge to work	2015-10-20 17:44:24 -07:00
Seth Alves	7dcbb5849a	another bug	2015-10-20 17:44:12 -07:00
Seth Alves	ed480f651f	missed a line	2015-10-20 17:43:31 -07:00
Seth Alves	f16b62df83	- grab script: possible fix for line disappearing ... - grab script: go from 3 pickrays back to 1 - grab script: put "sphere" test back in, but with fixed distance test	2015-10-20 17:34:35 -07:00