106 commits

Author	SHA1	Message	Date
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
Dante Ruiz	41c6261b74	LaserPointer: made _objectLockEnd into a struct	2017-11-06 16:04:33 -08:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -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
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -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
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -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	58172cfbd4	merge from master	2017-10-17 18:05:59 -07:00
SamGondelman	640ad514bc	updates based on austin's comments	2017-10-17 17:53:10 -07:00
SamGondelman	05f4883104	get rid of valid	2017-10-17 16:15:54 -07:00
SamGondelman	6d6ede075f	resolve conflicts	2017-10-17 15:26:32 -07:00
SamGondelman	8a5759df69	PickManager::addPick	2017-10-17 15:22:39 -07:00