392 commits

Author	SHA1	Message	Date
Seth Alves	4886f1cbfc	don't run stylus-on-overlay code unless the overlay is a web3d overlay	2017-03-06 12:38:19 -08:00
Seth Alves	27066e89a6	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:46:19 -08:00
Seth Alves	a2d2c41f02	remove debug print	2017-03-06 11:45:49 -08:00
Seth Alves	eb47db4441	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:07:22 -08:00
Seth Alves	19a31d7630	don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 10:15:53 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
Seth Alves	c677326025	Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet ... Touch the tablet with your finger	2017-03-04 11:58:47 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
Seth Alves	bccfa79e8b	Merge pull request #9749 from ctrlaltdavid/21176 ... If someone else is grabbing entity you want to grab show their grab beam	2017-03-03 13:43:28 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	40caa1ea49	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-03 09:01:57 -08:00
David Rowe	388a144af1	Tidying after merge	2017-03-03 18:44:50 +13:00
David Rowe	482c23ead5	Merge branch 'master' into 21186 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-03-03 18:38:42 +13:00
Brad Hefta-Gaub	e655e442a0	Merge pull request #9799 from sethalves/steady-hand-lasers ... Steady hand lasers	2017-03-02 18:27:39 -08:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	155a310852	Merge pull request #9761 from Menithal/21166 ... WL#21166 Cloneable Equipment	2017-03-02 16:33:13 -08:00
Anthony J. Thibault	644e29a43d	disable WANT_STATE_DEBUG in handControllerGrab.js	2017-03-02 14:15:05 -08:00
Seth Alves	bbfd373887	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 12:51:52 -08:00
Seth Alves	9b3c16d489	get handControllerGrab overlay lines working again	2017-03-02 12:48:37 -08:00
Seth Alves	2047e0194d	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 12:44:10 -08:00
Seth Alves	94b5e6333c	get handControllerGrab overlay lines working again	2017-03-02 11:02:06 -08:00
Seth Alves	9d4445fd61	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 10:07:37 -08:00
Seth Alves	8893c4770e	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 10:02:33 -08:00
Seth Alves	93055a67a8	use new-style hand-lasers for both hands	2017-03-02 10:01:08 -08:00
Anthony J. Thibault	4f03c06a94	Added General Preference to control stylus vs finger usage ... By default the finger is preferred over the stylus.	2017-03-01 18:07:53 -08:00
Seth Alves	7f6b803652	3d-line-overlays can now have an endParentID and endParentJointIndex	2017-03-01 17:27:32 -08:00
Seth Alves	7c4869eb73	fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother	2017-03-01 16:10:07 -08:00
Menithal	fd1fded276	Fixed Clone instancing issues	2017-03-02 00:59:45 +02:00
Anthony J. Thibault	d142c3d69b	eslint fix	2017-03-01 13:29:24 -08:00
Anthony J. Thibault	f418457100	Index finger touch support for the tablet-ui.	2017-03-01 13:28:17 -08:00
Ryan Huffman	1c3840dc78	Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-01 10:25:16 -08:00
Matti Lahtinen	d0c2c26a8e	One last gotcha from the conflict resolution.	2017-02-28 16:37:08 +02:00
Matti Lahtinen	e21785d5ec	Merge branch 'master' into 21166	2017-02-28 16:34:28 +02:00
David Rowe	d8d17be0e0	Rotate about translation grab position	2017-02-28 23:22:07 +13:00
David Rowe	e3f2f3c5bc	Tidying	2017-02-28 23:04:23 +13:00
David Rowe	28768d4a78	Rotate the entity by twice the rotating controller's rotation	2017-02-28 22:22:34 +13:00
David Rowe	5b6f953ac2	Add hand controller state of distance-rotating for second grab hand	2017-02-28 17:35:13 +13:00
Menithal	9fbde41dc4	Styling formating and Rebuild attempt	2017-02-27 23:27:48 +02:00
David Rowe	6fcc096bcf	Fix JavaScript error	2017-02-28 10:14:38 +13:00
David Rowe	08cae1d3f2	Make other avatar's grab beam finish at entity's centroid	2017-02-28 10:02:06 +13:00
David Rowe	f4a3627b76	Make other avatar's grab beam start at more natural position	2017-02-28 09:47:36 +13:00
Menithal	1d8be2aeaa	Added missing dynamic	2017-02-26 19:17:46 +02:00
Menithal	69949cd6b5	Finalized Grab-Clone action	2017-02-26 18:49:13 +02:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Seth Alves	eedc5c1647	don't allow tablet to get stuck to a hand when passing it back and forth between hands	2017-02-24 12:10:52 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	f208f5e2d1	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:34:10 -08:00
David Rowe	a98824f483	Code review	2017-02-25 08:13:15 +13:00
David Rowe	d9a716bf3d	If someone else is grabbing entity you want to grab show their grab beam	2017-02-24 18:42:52 +13:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00