1172 commits

Author	SHA1	Message	Date
unknown	9e4914975b	missing reset flag on end equip, remove mouseEquip check on unequip via U	2018-04-17 16:13:10 -07:00
David Back	e86ef1c2d6	fix bracket	2018-04-16 13:33:17 -07:00
David Back	ad85e2b053	pre PR adjustments	2018-04-16 13:12:33 -07:00
David Back	78c0ec5770	remove animations	2018-04-16 12:56:22 -07:00
David Back	76c7ec69ce	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-13 14:28:14 -07:00
David Back	243b3637c4	fix grab.js change	2018-04-12 12:41:36 -07:00
Dante Ruiz	cdc248129c	fix grab.js	2018-04-11 14:25:06 -07:00
David Back	59971869f5	desktop equip	2018-04-10 19:06:27 -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
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
Dante Ruiz	654770af51	fix controller dispatacher error	2018-03-05 09:39:26 -08: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	d12a4f0c18	little change	2018-03-02 14:30:02 -08:00
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -08:00
Dante Ruiz	05fb3cfd9a	fixing hyper link for entities	2018-03-02 14:03:24 -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
Andrew Meadows	b4f941af03	finish purge of RayPick from grab.js	2018-03-01 08:42:08 -08:00
Andrew Meadows	181944d5db	fix bugs in controllerDispatcher.js	2018-03-01 08:41:13 -08:00
David Rowe	2ff78493db	A further guard	2018-02-13 10:11:18 +13:00
David Rowe	b1f49be790	Merge branch 'master' into 21742 ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 10:04:32 +13:00
Dante Ruiz	0dac851def	fixing case when grabbed target is destroyed	2018-02-08 17:08:51 -08:00
David Rowe	adb6f66a05	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
Dante Ruiz	601914180d	fixing teleport module for sit script	2018-02-05 11:52:35 -08:00
Seth Alves	c4f57877dd	if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright	2018-01-31 10:06:20 -08:00
John Conklin II	455090d2b9	Revert "Display both lasers on tablet and Web surfaces"	2018-01-19 15:15:52 -08:00
John Conklin II	db5bf68431	Merge pull request #12203 from ctrlaltdavid/21703 ... Display both lasers on tablet and Web surfaces	2018-01-19 15:15:44 -08:00
David Rowe	7898aa2c4b	Code review	2018-01-20 10:32:42 +13:00
David Rowe	94e6a68d41	Code review	2018-01-20 09:50:24 +13: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
Dante Ruiz	d88ff701b5	reduce calls to isPointOnDesktopWindow	2018-01-18 10:48:35 -08: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
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