36 commits

Author	SHA1	Message	Date
Dante Ruiz	358aa547b1	feedback changes	2018-11-08 09:58:53 -08:00
Dante Ruiz	f664421fe0	addressing code review feedback	2018-11-08 09:58:53 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
sabrina-shanman	2ef85dfdba	Merge branch 'master' into stt_parenting2	2018-10-03 11:39:00 -07:00
sabrina-shanman	f0de3ef31c	jsdocs: Do not list scaleWithAvatar as separate property, and document 0 as default for parentJointIndex	2018-10-01 09:18:52 -07:00
sabrina-shanman	2dd8140158	Make scaleWithAvatar an alias for scaleWithParent in PointerScriptingInterface and make true the default for parabola pointers	2018-09-27 17:29:42 -07:00
David Rowe	06b4f51a08	Misc fixes	2018-09-25 11:33:08 +12:00
David Rowe	90ef109476	Remove superseded Pointers API functions	2018-09-25 11:11:53 +12:00
David Rowe	e29b403abc	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js	2018-09-24 11:44:28 +12:00
sabrina-shanman	62344c106d	Make render states a map when returned from PointerScriptingInterface::getPointerProperties	2018-08-31 11:19:53 -07:00
sabrina-shanman	e94d7de99a	Add JS API hook for getting overlay IDs from a pointer via ... Pointer.getPointerProperties	2018-08-31 09:18:07 -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
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	9b41cb5554	improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot	2018-07-25 15:19:25 -07:00
SamGondelman	fbcddf1445	test gradual normal interpolation	2018-07-24 14:15:49 -07:00
SamGondelman	39fa3420ec	pointer rendering, update teleport.js	2018-07-19 12:02:39 -07:00
SamGondelman	86c56195d3	refactoring common path pointer functionality	2018-07-17 16:15:20 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
David Rowe	8e9799b80f	Pointers API JSDoc fix up	2018-05-15 16:36:42 +12: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
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -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	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -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	e9a5acda06	control hovering, preset buttons for clicking, constness, scroll off ... surface	2017-10-30 10:28:43 -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