112 commits

Author	SHA1	Message	Date
David Rowe	c41d74621e	Merge branch 'master' into M17217-b ... # Conflicts: # interface/src/raypick/PathPointer.cpp	2018-08-31 14:26:24 +12:00
sabrina-shanman	a4bb8cb622	Add comment on future of PickTransformNodes	2018-08-30 09:08:02 -07:00
sabrina-shanman	cce62f4d92	Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding	2018-08-24 15:47:52 -07:00
sabrina-shanman	6e160ad22f	Add TransformNode-based parenting and implement for CollisionPicks	2018-08-24 15:47:52 -07:00
sabrina-shanman	b0f8d3e427	Add PickTransformNode	2018-08-24 15:47:52 -07:00
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -07:00
SamGondelman	c474f38860	force coarse picking, sort avatars	2018-08-22 18:07:16 -07:00
David Rowe	7e46a99400	Merge branch 'master' into M17217-b	2018-08-17 10:35:52 +12:00
sabrina-shanman	e5cb078133	Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target	2018-08-13 14:51:37 -07:00
SamGondelman	6b7f5b662e	jsdoc fixes	2018-08-06 09:41:05 -07:00
David Rowe	c0dc70c076	Parent play area to teleport target unless underneath avatar	2018-08-04 17:26:18 +12:00
sabrina-shanman	870940b3a0	Merge branch 'master' into safe-teleport-target	2018-08-03 18:14:43 -07:00
David Rowe	ee605e5f21	Merge remote-tracking branch 'SamGondelman/parabolic' into M17217-a ... # Conflicts: # scripts/system/controllers/controllerModules/teleport.js	2018-08-04 09:42:11 +12:00
SamGondelman	e9d1423c61	jsdoc fixes	2018-08-03 13:37:41 -07:00
David Rowe	5be945715f	Include the teleporter target in the occlusion	2018-08-03 08:22:36 +12:00
SamGondelman	645f905239	cleanup, model performance improvements	2018-07-24 13:25:49 -07:00
sabrina-shanman	f33ee55f9e	Create CollisionPick API	2018-07-19 10:33:21 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
David Rowe	8e9799b80f	Pointers API JSDoc fix up	2018-05-15 16:36:42 +12:00
David Rowe	36752ee701	PickType API JSDoc fix up	2018-05-15 11:23:29 +12:00
Dante Ruiz	c99676b510	atlernate fix for selected entities	2018-03-30 13:44:54 -07:00
Andrew Meadows	3f1944eb8a	fix variable name typo	2018-03-09 08:35:18 -08:00
Andrew Meadows	9eecd3cb80	update styluses first: they are cheap	2018-03-09 08:35:18 -08:00
Andrew Meadows	f83c6000df	use 'auto' for very long type	2018-03-09 08:35:18 -08:00
Andrew Meadows	24635b0451	remove unused debug cruft variable	2018-03-09 08:35:18 -08:00
Andrew Meadows	9fbe7ec194	time-box Picks and solve in round-robin sequence	2018-03-09 08:35:18 -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	24dcc8788c	Code review	2018-01-20 10:07:23 +13:00
David Rowe	94e6a68d41	Code review	2018-01-20 09:50:24 +13: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
SamGondelman	fba06a74aa	fix laser and stylus deadspot	2017-12-11 15:51:22 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -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
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	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
SamGondelman	cbf0543646	deadspot	2017-11-10 13:22:38 -08:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
SamGondelman	76eb4c656e	fix multi-touch and keyboard on web entities	2017-10-30 16:41:59 -07:00
SamGondelman	e9a5acda06	control hovering, preset buttons for clicking, constness, scroll off ... surface	2017-10-30 10:28:43 -07:00
SamGondelman	7951826e49	more advanced laser focusing	2017-10-26 16:10:27 -07:00
SamGondelman	cf34fe3345	laserpointers generate pointerevents	2017-10-26 12:01:09 -07:00
SamGondelman	7686948daf	resolve conflicts and cleanup	2017-10-20 15:23:17 -07:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
SamGondelman	24ce09f914	generalized pointer, laserpointermanager -> pointermanager	2017-10-20 11:28:48 -07:00
SamGondelman	d7745efc8e	one global pickmanager	2017-10-19 16:55:24 -07:00
SamGondelman	3572f7f5db	non-templated pickresult wip	2017-10-19 13:41:16 -07:00
SamGondelman	6d6ede075f	resolve conflicts	2017-10-17 15:26:32 -07:00
SamGondelman	975a3e5bbb	Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers	2017-10-17 13:23:08 -07:00
SamGondelman	315baeae1f	threading fix	2017-10-17 13:22:40 -07:00
SamGondelman	596be8ec27	pickmanager wip	2017-10-17 13:16:37 -07:00
Bradley Austin Davis	50929b780d	Add constructor to suppress warning	2017-10-17 12:59:41 -07:00
SamGondelman	429905de51	update scripts to use ignoreItems, fix caching bug	2017-10-16 15:52:17 -07:00
Bradley Austin Davis	3f99e70af0	C++ cleanup for pointers / picking	2017-10-16 14:20:31 -07:00