1135 commits

Author	SHA1	Message	Date
Dante Ruiz	125eb9ce44	add new tablet model and adjust screen offset	2018-01-09 14:31:57 -08:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch ... Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Dante Ruiz	fd83e00df4	fix tablet interaction and far grab functionallity	2018-01-08 11:30:21 -08:00
luiscuenca	8a7c68829d	Optimizations, cleanings and globals	2018-01-07 11:56:30 -07:00
Zach Fox	0c38a5598f	Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection ... Fix bugs related to inspecting entities with hand controllers	2018-01-05 15:50:00 -08:00
luiscuenca	4f6a804fd1	Fix magic numbers	2018-01-05 16:27:48 -07:00
David Rowe	5431b7137b	Code review	2018-01-06 08:27:24 +13:00
luiscuenca	108748ca96	smooth transitions and slower back to default	2018-01-05 09:55:50 -07:00
David Rowe	69dff9ac09	Remove unused code	2018-01-05 16:16:55 +13:00
David Rowe	936b5f3571	Laser on tablet bezel as well as screen and "x" button	2018-01-05 16:15:59 +13:00
David Rowe	67eb282815	Don't swap hands if both triggers are squeezed	2018-01-05 12:12:36 +13:00
David Rowe	27bed8d1f1	Tidying	2018-01-05 11:05:49 +13:00
David Rowe	fb09a9724e	Change laser hand with trigger squeeze	2018-01-05 11:04:09 +13:00
David Rowe	9f7a2b18e6	Use laser from dominant hand if both hands are pointing at the tablet	2018-01-05 10:04:39 +13:00
David Rowe	02f4085368	Fix magic number	2018-01-05 09:00:53 +13:00
luiscuenca	367e2266f7	Fix eslint	2018-01-04 12:04:52 -07:00
luiscuenca	ef0164c272	Fix tabs	2018-01-04 11:43:51 -07:00
luiscuenca	28d9409bf0	Fix default hand poses	2018-01-04 11:37:37 -07:00
David Rowe	6095a90e69	Don't display default lasers when Shapes app is active	2018-01-04 21:09:38 +13:00
David Rowe	6c16fcfe65	Fix tablet laser when Shapes app is running	2018-01-04 16:37:20 +13:00
David Rowe	efa6f1f02f	Use "Prefer Stylus Over Laser" setting	2018-01-04 15:00:17 +13:00
Zach Fox	ff4f582c7d	Thanks Howard	2018-01-03 17:23:35 -08:00
Zach Fox	8d4a6f01cb	Fix bugs related to inspecting entities with hand controllers	2018-01-03 16:03:37 -08:00
David Rowe	6e43497e14	Merge tag 'RELEASE-7602' into 21661 ... Jenkins Git plugin tagging with RELEASE-7602	2018-01-03 16:46:10 +13:00
luiscuenca	47dbb0c168	load script manually	2017-12-29 15:35:44 -07:00
luiscuenca	49bd62ca29	Touch feeling for near grab	2017-12-29 14:04:36 -07:00
luiscuenca	53e1c57e3b	Make lasers scale with avatar	2017-12-15 13:46:15 -07:00
Seth Alves	3a00d31c15	oops	2017-12-12 12:59:35 -08:00
Seth Alves	dba05ae8e2	try harder to keep setTimeout loop going in controller-dispatcher	2017-12-12 12:38:01 -08:00
Dante Ruiz	f4a9acab92	Merge pull request #11833 from druiz17/controllerDispatcher-interval ... change controllerDispatcher to setTimeOut update	2017-12-08 16:36:46 -08:00
Seth Alves	a7a6dee8e0	Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling ... Fix for hand controller avatar scaling.	2017-12-08 07:17:59 -08:00
Anthony J. Thibault	542af47e9e	Fix for hand controller avatar scaling. ... * Added getDomainMaxScale() and getDomainMinScale() to JS api. * Updated scaleAvatar controller module to use this to prevent scaling past the limits. * Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe, so that they can be invoked on the script thread. * Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton. and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.	2017-12-07 17:08:13 -08:00
Dante Ruiz	0286f4646a	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-12-07 16:19:03 -08:00
Dante Ruiz	32fca16c85	fix radius equiping	2017-12-06 14:16:32 -08:00
Dante Ruiz	bbc022da2d	fix-far-to-equip	2017-12-05 14:09:46 -08:00
Dante Ruiz	eaa049863d	Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equipping	2017-11-30 14:49:24 -08:00
Dante Ruiz	db374b8c6d	fixing adjusting equipped entities	2017-11-30 14:49:06 -08:00
Dante Ruiz	b9f60aff2a	fix-edit	2017-11-30 13:22:26 -08:00
Dante Ruiz	6fd8fb1e5b	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-11-30 11:52:41 -08:00
Dante Ruiz	cbaf59d99e	disable stylus	2017-11-30 11:13:17 -08:00
Dante Ruiz	024dbcd712	fix scrolling	2017-11-30 09:07:19 -08:00
Dante Ruiz	982fad5050	fix laser interaction on HUD in HMD mode	2017-11-29 10:42:35 -08:00
Dante Ruiz	70820e6075	laser allways on prototype	2017-11-28 15:37:36 -08:00
Brad Hefta-Gaub	068b93fc30	Merge pull request #11838 from druiz17/fix-grabbing ... fixing setting incorrect parent when grabbing entities	2017-11-27 08:27:42 -08:00
Dante Ruiz	56972d1547	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing	2017-11-21 13:09:45 -08:00
Dante Ruiz	9622fef149	fix controllerDispatcher time step	2017-11-21 09:48:19 -08:00
Dante Ruiz	5bb23ef1df	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-11-21 09:30:41 -08:00
Dante Ruiz	a201312dcf	re-added fix that when into master that this branch breaks	2017-11-20 13:10:35 -08:00
Brad Hefta-Gaub	95f59b0ab8	Merge pull request #11844 from druiz17/stylus-near-grab ... allow near grabbing of entities while stylus module is running.	2017-11-17 17:33:54 -08:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -08:00