411 commits

Author	SHA1	Message	Date
James B. Pollack	2ec712a5db	disable near grabbing on sliders	2015-12-28 15:27:17 -08:00
James B. Pollack	f0a12e0251	switch	2015-12-28 14:50:35 -08:00
Eric Levin	890b39f04b	Merge pull request #6740 from imgntn/blacklist_grab ... Add Raypick Blacklisting to handControllerGrab.js	2015-12-28 13:39:23 -08:00
James B. Pollack	7d7d0d4c07	mege	2015-12-28 13:21:00 -08:00
James B. Pollack	8eeae5ddf0	Merge pull request #6736 from ericrius1/handGrabCalcs ... Hand grab calcs	2015-12-28 10:49:55 -08:00
James B. Pollack	0e30393c81	make sure theres something on the blacklist	2015-12-27 12:47:56 -08:00
James B. Pollack	546e908633	protect blacklisting to my id	2015-12-27 12:46:40 -08:00
James B. Pollack	28c53822b1	add raypick blacklisting to hand grab script	2015-12-27 12:37:33 -08:00
Brad Davis	8e2a79ba4c	Merge pull request #6735 from ZappoMan/headPoseReticle ... add a test script for HMD.getHUDLookAtPositionXX()	2015-12-27 13:19:18 -05:00
ericrius1	cd983db419	fixed merge conflicts	2015-12-23 15:13:45 -08:00
ericrius1	b4988b0998	Taking individual avatar hand size into consideration for grabbing objects	2015-12-23 15:09:10 -08:00
Brad Hefta-Gaub	f8a515de64	add a test script for HMD.getHUDLookAtPositionXX()	2015-12-23 14:46:18 -08:00
AlessandroSigna	2c72e7964d	Fix assignment	2015-12-23 13:54:06 -08:00
Thijs Wenker	505f4ce7e4	Merge branch 'master' of https://github.com/worklist/hifi into 20736 ... Conflicts: examples/controllers/handControllerGrab.js	2015-12-23 02:37:38 +01:00
James B. Pollack	4115138b5b	fix merge problems	2015-12-22 17:22:55 -08:00
James B. Pollack	64eb22bf22	merging	2015-12-22 16:34:01 -08:00
James B. Pollack	edd11a670a	minor adjustments to particles	2015-12-22 14:38:53 -08:00
James B. Pollack	60f2314469	remove debugging print	2015-12-22 14:38:05 -08:00
Brad Davis	a6d9dbc5c4	Merge pull request #6728 from ZappoMan/rightClickMenu ... More Hand Reticle movement improvements	2015-12-22 14:00:42 -08:00
Brad Hefta-Gaub	9a3d72c7b6	tweak sleep cycle slightly	2015-12-22 13:55:01 -08:00
Brad Hefta-Gaub	119f3e9895	make both hands and mouse work	2015-12-22 13:35:16 -08:00
James B. Pollack	7bc7bddc3a	set defaults	2015-12-22 12:00:45 -08:00
James B. Pollack	80e8fcf502	Merge branch 'master' into particle_grab	2015-12-22 11:49:51 -08:00
ericrius1	fdb909ca31	merged	2015-12-22 09:40:42 -08:00
Thijs Wenker	c62ff3e5be	Merge branch 'master' of https://github.com/worklist/hifi into 20736	2015-12-22 14:14:04 +01:00
Brad Hefta-Gaub	025e769a9f	average both hands, enabled both mouse clicks, and detect base station resting hand	2015-12-21 18:25:30 -08:00
Brad Hefta-Gaub	da86686533	fix reticle drive	2015-12-21 17:10:01 -08:00
ericrius1	1cdee11784	Merge branch 'master' into polylineOptimizations	2015-12-21 12:49:00 -08:00
Thijs Wenker	5d1e5b054a	Merge branch 'master' of https://github.com/worklist/hifi into 20736	2015-12-21 21:48:55 +01:00
Brad Hefta-Gaub	248b3d09ac	add absolute rotation based hand reticle movement	2015-12-21 10:49:49 -08:00
ericrius1	45ba7a3d35	merged	2015-12-21 10:46:54 -08:00
ericrius1	0dd7287e61	mergedq	2015-12-21 10:46:45 -08:00
ericrius1	7a7befafb9	arc balls working	2015-12-21 10:43:59 -08:00
Brad Hefta-Gaub	e929e3f789	more work on angular velocity tests	2015-12-18 19:20:32 -08:00
ericrius1	1beec0dbe7	balls	2015-12-18 18:15:05 -08:00
Brad Hefta-Gaub	a621579f17	add philips version of hand movement	2015-12-18 15:44:21 -08:00
Brad Hefta-Gaub	4075f355a3	more work on hand movement	2015-12-18 15:44:01 -08:00
James B. Pollack	387c30d83f	close button	2015-12-18 15:04:13 -08:00
Brad Hefta-Gaub	5701ad2e8c	update to new angular velocity	2015-12-18 12:38:50 -08:00
Brad Hefta-Gaub	762aefbbca	add hand driven reticle	2015-12-17 17:38:20 -08:00
James B. Pollack	a25feb5578	switching branches	2015-12-17 16:58:38 -08:00
James B. Pollack	8e2128c692	update light volume when you move light parent	2015-12-17 11:59:21 -08:00
Brad Hefta-Gaub	63a63152a4	add procedural hand pose example	2015-12-17 11:10:49 -08:00
James B. Pollack	5cc5a2ab33	working non kinematic release	2015-12-17 10:58:14 -08:00
James B. Pollack	cd911b31d2	dont accidentally constrain all objects	2015-12-17 10:26:54 -08:00
Brad Hefta-Gaub	0b9bd858a7	implement support for pose ScriptEndpoints	2015-12-16 21:28:27 -08:00
James B. Pollack	40a096ca8d	kinematic grab things	2015-12-16 14:34:01 -08:00
James B. Pollack	e37d68449b	rename folder	2015-12-16 13:57:40 -08:00
James B. Pollack	b09575dc40	Merge branch 'master' into light_mod	2015-12-16 09:56:17 -08:00
James B. Pollack	9a2d9997e9	prep for feedback	2015-12-15 18:20:12 -08:00