221 commits

Author	SHA1	Message	Date
AlessandroSigna	ae2f7f6ff6	Fix paddleBall.js	2015-10-22 18:50:23 -07:00
Brad Davis	103fe3c545	Merge pull request #6155 from ZappoMan/fixScripts ... fix airGuitar.js	2015-10-22 18:19:26 -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 Hefta-Gaub	c826b48c92	fix airGuitar.js	2015-10-22 15:05:59 -07:00
Brad Hefta-Gaub	3e7364608b	make handControllerGrab.js work with new API	2015-10-22 09:17:29 -07:00
Brad Davis	21a3079a39	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-21 10:05:32 -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	e0615309bb	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-20 17:48:38 -07:00
Brad Davis	0e419e3fbb	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-20 17:47:37 -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
James B. Pollack	8e1c3c32d1	additions to debug and also to handle some two handed situations	2015-10-20 16:24:17 -07:00
samcake	16f96715a3	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-20 10:16:08 -07:00
Brad Davis	8d0148a1ca	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-20 10:13:31 -07:00
Brad Hefta-Gaub	dfe3e5b1cb	fix laser lifetimes	2015-10-20 09:30:27 -07:00
samcake	8701d73ee9	DOing the groundwork to pass along the pose ... still not working	2015-10-19 19:05:37 -07:00
Seth Alves	41f7ef1e2e	cleanups	2015-10-19 16:53:27 -07:00
Seth Alves	6138775270	put back support for spatialKey	2015-10-19 15:40:14 -07:00
Seth Alves	5a968e3c96	tweak	2015-10-19 15:20:04 -07:00
Seth Alves	8fbf081223	git rid of sphere test	2015-10-19 14:51:18 -07:00
Brad Hefta-Gaub	f90f0ed1f3	apply Huffman's feedback to Sam's PR	2015-10-17 12:34:32 -07:00
samcake	941f95c7d4	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-16 18:07:25 -07:00
samcake	20416455db	Adding the loadMapping feature	2015-10-16 18:06:58 -07:00
Brad Davis	5bac1aae2d	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-16 17:23:30 -07:00
samcake	6d3d29b6b7	Adding a new mapping	2015-10-16 15:24:44 -07:00
samcake	f0034844e7	Actions working from the Controller layer	2015-10-16 12:24:12 -07:00
Seth Alves	c98685f6d3	in STATE_CONTINUE_FAR_GRABBING_NON_COLLIDING, when the ray moves off of the entity, switch back to search state	2015-10-16 11:39:27 -07:00
Seth Alves	066696e201	don't go into continue-far-grabbing-non-colliding mode.	2015-10-16 11:18:41 -07:00
samcake	43d7fe491e	wiring the actions	2015-10-15 17:53:53 -07:00
Brad Hefta-Gaub	26f82e899e	Merge pull request #6079 from ericrius1/whiteboard ... Entity whitelist for raypicking and whiteboard painting example	2015-10-15 17:50:35 -07:00
samcake	cdfe9788d1	Merging	2015-10-15 10:49:08 -07:00
Seth Alves	c884f466bc	adjust timing of action refresh	2015-10-15 10:40:58 -07:00
ericrius1	55c68e0509	Merge branch 'master' into whiteboard	2015-10-15 10:08:32 -07:00
samcake	12e103c90c	Get json creating the mappings from js	2015-10-14 17:41:39 -07:00
Eric Levin	0b92bc11f6	fixed spacing	2015-10-14 13:26:10 -07:00
ericrius1	eb7b720945	got rid of whitespace	2015-10-14 13:24:22 -07:00
ericrius1	6cd9bf407f	Reverted handControllerGrab	2015-10-14 11:40:06 -07:00
ericrius1	7fb6b7e272	Reverted hand controller	2015-10-14 11:31:09 -07:00
ericrius1	20d1a2440c	Ignoring unknown types in collision	2015-10-14 11:15:49 -07:00
Seth Alves	2a9b1c0fc3	fix refresh of hold action	2015-10-14 09:31:29 -07:00
Seth Alves	755b971906	tweak	2015-10-13 14:31:52 -07:00
ericrius1	04f0d792bb	Reverted grab back to 5 hz	2015-10-12 17:36:53 -07:00
ericrius1	33ff21f376	Got rid of debug message in handControllerGrab script	2015-10-12 17:36:07 -07:00
ericrius1	f93b1d3325	Correctly whitelisting entities for ray picking	2015-10-12 17:05:34 -07:00
Seth Alves	f0ce698d78	switch back to springy grab	2015-10-12 16:57:20 -07:00
ericrius1	d01dda9c81	Adding in functionality to include only specified Ids in ray picking	2015-10-12 14:40:11 -07:00
Seth Alves	5c95306e8e	merge from upstream	2015-10-10 09:34:13 -07:00
Seth Alves	7824d03e11	grab script picks 5x per second rather than 60x	2015-10-09 17:56:32 -07:00