55 commits

Author	SHA1	Message	Date
danteruiz	87cfbe48d1	fix webSurfaceIntersection	2019-03-07 13:11:18 -08:00
r3tk0n	12ffa41984	Prevent HUD and Web Surface lasers from interrupting FarGrab.	2019-03-02 13:55:06 -08:00
Dante Ruiz	089a223c2d	more CR changes	2018-12-12 15:29:01 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Brad Hefta-Gaub	04d251c321	Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes ... Merged interstitial bug fixes	2018-10-23 14:30:55 -07:00
Wayne Chen	d008bfa523	partial requested code changes	2018-10-22 11:29:36 -07:00
Wayne Chen	7284c3ad53	Merge branch 'intersttiial-do-not-intersect-web' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes	2018-10-22 10:28:35 -07:00
David Rowe	eb179363f6	Merge branch 'master' into M17853 ... # Conflicts: # scripts/system/controllers/controllerDispatcher.js	2018-10-20 11:19:26 +13:00
Dante Ruiz	fa6b3019f6	fix js memory leak	2018-10-12 12:07:39 -07:00
Dante Ruiz	a47a1c03e6	ignore web entities	2018-10-10 14:08:47 -07:00
Dante Ruiz	296ea8a5af	fix overlay issues during interstitial mode	2018-10-10 12:00:58 -07:00
Seth Alves	834699fa12	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
Wayne Chen	521361293a	moving comment locations inside conditionals	2018-09-12 11:03:00 -07:00
Wayne Chen	acf34dcfdf	one more unused variable	2018-09-12 10:58:05 -07:00
Wayne Chen	8bef0d0de4	removing unused variables	2018-09-12 10:55:40 -07:00
Wayne Chen	b9f0af63e1	changing check for near grabbing modules - fixes grabbing for dynamic	2018-09-12 10:38:21 -07:00
Wayne Chen	045ac4cb0d	allowing grip button for interrupting web scroll	2018-09-11 17:43:03 -07:00
Wayne Chen	b6c5ae2a68	staging changes	2018-09-11 15:23:40 -07:00
Wayne Chen	7aae536624	adding fix to allow web scroll	2018-09-11 11:41:24 -07:00
David Rowe	f84f3b20cd	Disable near and far lasers when tablet is grabbable	2018-08-31 10:25:12 +12:00
Wayne Chen	7360629d31	modifying variable naming to fit convention	2018-08-21 14:13:55 -07:00
Wayne Chen	5b4eb92281	adding fix	2018-08-21 14:04:29 -07:00
Wayne Chen	c0dfbac480	adding comment for possible solution - still WIP	2018-07-24 10:04:51 -07:00
Wayne Chen	e4a5be668a	adding check function for pointing at near grabbable entity	2018-07-23 12:29:01 -07:00
Wayne Chen	a2aeacab64	adding fix for near grabbing with web entity	2018-07-23 12:17:19 -07:00
Wayne Chen	32886d67d9	optimizing near-/far- grabbable entities a bit	2018-07-20 17:17:36 -07:00
Wayne Chen	be5fdef974	adding check in isReady for grabbing non-web entitys	2018-07-20 15:26:55 -07:00
Wayne Chen	4e3a6cb320	adding ignore for far-/near- grabbable entities when operating on web surface	2018-07-20 11:18:20 -07:00
Wayne Chen	5276d84aa5	pushing what i coded out loud - it broke the way grabbing works	2018-07-19 17:08:12 -07:00
Wayne Chen	ac642f126a	adding extra conditional to ensure all modules are checked	2018-07-17 20:52:50 -07:00
Wayne Chen	30ca5a8cbd	code cleanup to use web laser if laser is not pointing at grabbable entity	2018-07-17 16:44:49 -07:00
Wayne Chen	eb7bde1bfc	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
Wayne Chen	813c58a1fb	adding check to see if near grabbing is ready	2018-07-17 11:53:55 -07:00
David Back	f815ad1ddd	tabs	2018-07-06 17:02:41 -07:00
David Back	c271e1aae4	fix triggering at non-web overlays	2018-07-06 17:02:29 -07:00
David Back	175e4b7013	also check tabletID	2018-06-18 11:06:33 -07:00
David Back	fcccaaea48	tabs	2018-06-14 17:49:02 -07:00
David Back	ed5b05eef4	fix auto laser on locked web entity, only auto laser at tablet or web overlays	2018-06-14 17:43:45 -07:00
Andrew Meadows	27c6e7915e	purge LaserPointers refs from scripts that don't use it	2018-03-01 08:43:30 -08:00
John Conklin II	455090d2b9	Revert "Display both lasers on tablet and Web surfaces"	2018-01-19 15:15:52 -08:00
David Rowe	45bc6b8dab	Dominant hand gets the highlight if both start pointing simultaneously	2018-01-19 16:41:23 +13:00
David Rowe	e0e6fc711b	Replace Pointers API function setNonHoverItems() with setDoesHover()	2018-01-19 16:05:09 +13:00
David Rowe	403dd3d7d0	Only first laser highlights	2018-01-18 22:31:12 +13:00
David Rowe	5878e36ea8	Display both lasers	2018-01-18 14:24:23 +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