132 commits

Author	SHA1	Message	Date
David Rowe	0db440931e	Miscellaneous JSDoc fixes	2018-05-30 10:02:30 +12:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
David Rowe	b7a0ff523a	LaserPointers API JSDoc stubs	2018-05-15 17:36:23 +12:00
David Rowe	8e9799b80f	Pointers API JSDoc fix up	2018-05-15 16:36:42 +12:00
David Rowe	9040e45be7	RayPick API JSDoc stubs	2018-05-15 11:43:49 +12:00
David Rowe	3fb6fd1afb	Picks API JSDoc stubs	2018-05-15 11:22:47 +12:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
David Rowe	b8063840e7	Miscellaneous fixes	2018-04-26 21:17:05 +12:00
Dante Ruiz	a9a53c7d64	make resquested changes	2018-04-02 10:51:39 -07:00
Dante Ruiz	4b7e2cb331	made requested changes	2018-03-30 15:15:17 -07:00
Dante Ruiz	c99676b510	atlernate fix for selected entities	2018-03-30 13:44:54 -07:00
Andrew Meadows	9fbe7ec194	time-box Picks and solve in round-robin sequence	2018-03-09 08:35:18 -08:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes ... Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
humbletim	e2afcac534	include .extraInfo as part of RayPick API constructors	2018-01-26 18:34:13 -05:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
Brad Davis	6a91d549ce	Fix stylus overlay	2018-01-22 15:08:26 -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	e0e6fc711b	Replace Pointers API function setNonHoverItems() with setDoesHover()	2018-01-19 16:05:09 +13:00
David Rowe	ee2936d133	Add Pointers API function that disables hover events for nominated items	2018-01-18 14:07:07 +13:00
humbletim	4021455058	placeholder PickResult.extraInfo documentation	2018-01-03 04:20:12 -05: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
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
SamGondelman	4fbf5db697	Merge remote-tracking branch 'upstream/master' into hysteresis	2017-12-14 09:55:46 -08:00
SamGondelman	ce96fa7078	change hysteresis values based on testing	2017-12-11 17:32:58 -08:00
SamGondelman	fba06a74aa	fix laser and stylus deadspot	2017-12-11 15:51:22 -08:00
SamGondelman	52039e022b	merge from master, get rid of resolution in RayPick	2017-11-27 13:11:35 -08:00
samcake	a0e40efdc8	Fixing all the changes of interface name coming from upstream	2017-11-21 14:55:58 -08:00
samcake	ebd701a1ab	Merging with master	2017-11-21 14:40:37 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
luiscuenca	489e244342	More accurate scale from SensorToWorldScale	2017-11-14 09:56:23 -07:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
SamGondelman	cbf0543646	deadspot	2017-11-10 13:22:38 -08:00
luiscuenca	255a40ce31	Corrections	2017-11-09 18:38:04 -07:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
luiscuenca	1791ed01ca	add width param to vertex shader	2017-11-08 18:35:26 -07:00
luiscuenca	8c5f97f3d1	More corrections	2017-11-07 20:25:24 -07:00
luiscuenca	536bf6f81d	Corrections	2017-11-07 18:34:33 -07:00
luiscuenca	ee3900be4f	Corrections	2017-11-07 18:26:41 -07:00
Luis Cuenca	6fb47eef85	Merge branch 'master' into case7587	2017-11-07 17:19:39 -07:00
luiscuenca	332cb48a41	Lasers and teleport scale with avatar	2017-11-07 16:57:55 -07:00
Dante Ruiz	c9d67f762b	made requested changes	2017-11-06 16:20:16 -08:00
Dante Ruiz	067ed2ffe0	apply coding standard	2017-11-06 16:09:31 -08:00
Dante Ruiz	646e5455ac	forgot to remove unused variable	2017-11-06 16:05:44 -08:00