95 commits

Author	SHA1	Message	Date
Dante Ruiz	d6fbcb1668	remove entity highlighting	2018-11-19 11:04:09 -08:00
David Rowe	791ee04aea	Merge branch 'master' into M12661	2018-10-30 13:33:53 +13: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	afd8baca87	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialIgnoreFix	2018-10-22 10:01:57 -07:00
David Rowe	eb179363f6	Merge branch 'master' into M17853 ... # Conflicts: # scripts/system/controllers/controllerDispatcher.js	2018-10-20 11:19:26 +13:00
David Rowe	3e49d55dbf	Merge branch 'master' into M12661 ... # Conflicts: # scripts/system/controllers/controllerModules/farActionGrabEntity.js	2018-10-19 11:24:43 +13:00
Brad Hefta-Gaub	0e0542ec6e	Merge pull request #13890 from sethalves/grab-properties-1 ... move grab pseudo-properties (userData) into first-class EntityItemProperties	2018-10-17 13:29:20 -07:00
David Rowe	3bc4581f82	Fix far grabbing collisionless entity removing collisionless property	2018-10-13 10:22:27 +13:00
Wayne Chen	6f9593dabd	adding fix for far action grab	2018-10-08 16:59:39 -07:00
Wayne Chen	ea8229fca4	adding fix for length check	2018-10-08 13:10:41 -07:00
Wayne Chen	d6af09ca62	ignoring entities in interstitial/saving address on 404 error	2018-10-03 17:40:42 -07:00
Seth Alves	834699fa12	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
David Rowe	f84f3b20cd	Disable near and far lasers when tablet is grabbable	2018-08-31 10:25:12 +12:00
Seth Alves	52bbb4d2ab	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
David Rowe	54b96cd602	Fix incomplete transition from far-grabbing entity to grabbing tablet	2018-06-09 11:32:10 +12:00
David Rowe	dc46c2077d	Fix function name	2018-06-09 11:01:18 +12:00
Dante Ruiz	a593209ec1	remove highlight when point to the sky	2018-05-07 15:33:12 -07:00
Dante Ruiz	893832f4c7	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-05 16:01:36 -07:00
Dante Ruiz	cc341e8ad7	highlight nearby entities	2018-04-05 15:38:56 -07:00
Dante Ruiz	42149e295d	editing seletion style	2018-04-04 12:55:28 -07:00
Zach Fox	b641f87792	Merge pull request #12778 from zfox23/MS13792 ... Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-04 09:31:33 -07:00
Dante Ruiz	c9c3d8f332	adding entity selection for far grabbing	2018-04-04 08:07:35 -07:00
Zach Fox	5f47d51171	Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-03 15:35:46 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
Dante Ruiz	16749df83a	fix highlighting edge case	2018-03-30 14:14:13 -07:00
Dante Ruiz	3d7f7f0e62	fix parent tree grabbing	2018-03-27 14:05:43 -07:00
John Conklin II	3f751bb5ca	Merge pull request #12546 from druiz17/fix-hyperlink ... Fix hyperlink when far/near grabbing enitities	2018-03-05 08:23:51 -08:00
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
Andrew Meadows	27c6e7915e	purge LaserPointers refs from scripts that don't use it	2018-03-01 08:43:30 -08:00
Dante Ruiz	0dac851def	fixing case when grabbed target is destroyed	2018-02-08 17:08:51 -08:00
Dante Ruiz	d88ff701b5	reduce calls to isPointOnDesktopWindow	2018-01-18 10:48:35 -08:00
Dante Ruiz	fd83e00df4	fix tablet interaction and far grab functionallity	2018-01-08 11:30:21 -08: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
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
Dante Ruiz	70820e6075	laser allways on prototype	2017-11-28 15:37:36 -08:00
Dante Ruiz	8779d52ad3	making requested changes	2017-11-14 13:04:09 -08:00
Dante Ruiz	b779c33a1b	fixed lockEndUUID offset for scripts	2017-11-13 16:42:16 -08:00
Dante Ruiz	6173c33b51	fixing merge conflict	2017-11-13 15:02:25 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Dante Ruiz	abb6f786fa	added homebutton message and scripts cleanup	2017-11-01 11:03:48 -07:00
Dante Ruiz	30332c3d00	removing more laserPointers	2017-10-31 14:13:42 -07:00
Dante Ruiz	e5600e4f1e	one universal controller pointer for all modules	2017-10-30 16:58:14 -07:00
SamGondelman	a44e8efb99	merge from master	2017-10-26 12:14:53 -07:00
Dante Ruiz	2ec8f3f625	made non-dynamic entities collisionless during far-grab	2017-10-25 11:29:32 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07:00