69 commits

Author	SHA1	Message	Date
Dante Ruiz	c99676b510	atlernate fix for selected entities	2018-03-30 13:44:54 -07:00
SamGondelman	fba06a74aa	fix laser and stylus deadspot	2017-12-11 15:51:22 -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	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
luiscuenca	489e244342	More accurate scale from SensorToWorldScale	2017-11-14 09:56:23 -07:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -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
luiscuenca	1791ed01ca	add width param to vertex shader	2017-11-08 18:35:26 -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	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	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
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
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	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	6d6ede075f	resolve conflicts	2017-10-17 15:26:32 -07:00
SamGondelman	3ef7ebffba	working generalized pickmanager	2017-10-17 15:09:41 -07:00
Sam Gondelman	2e69d2b1ad	missed one scripting interface reference	2017-10-17 11:13:02 -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
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00
SamGondelman	6b02cbb911	move locking inside laserpointer and raypick	2017-10-05 13:17:57 -07:00
SamGondelman	0e3f1c5149	add setLaserLength, setLockEndUUID doesn't use defaultRenderStates	2017-09-22 16:11:24 -07:00
SamGondelman	cbe621f2b7	add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate	2017-09-22 15:15:15 -07:00
SamGondelman	f21c99257e	don't let scripts control visibility of laser pointers	2017-09-20 14:35:29 -07:00
Daniela	758f049f30	Correct offset for teleport pad.	2017-09-08 14:02:26 +01:00
Daniela	10e29d1cf0	Decrease offset for teleport pad. Add Bubble orientation and scale correction.	2017-09-08 12:45:29 +01:00
Daniela	9eb429b25a	Fix offset for teleport pad.	2017-09-08 11:23:19 +01:00
Daniela	d11a749365	Refactor 1 line. Pad alignment is correct.	2017-09-07 19:28:36 +01:00
Daniela	94e26a554d	Add 180 degrees rotation so that pad faces the avatar	2017-09-07 18:48:20 +01:00
Daniela	4c302b899d	Fix teleport pad alignment	2017-09-07 17:52:09 +01:00
Daniela	3ff707f27e	Add Avatar resize compatible teleport pad alignment	2017-09-07 13:31:41 +01:00