216 commits

Author	SHA1	Message	Date
Zach Fox	8d4a6f01cb	Fix bugs related to inspecting entities with hand controllers	2018-01-03 16:03:37 -08:00
Seth Alves	a7a6dee8e0	Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling ... Fix for hand controller avatar scaling.	2017-12-08 07:17:59 -08:00
Anthony J. Thibault	542af47e9e	Fix for hand controller avatar scaling. ... * Added getDomainMaxScale() and getDomainMinScale() to JS api. * Updated scaleAvatar controller module to use this to prevent scaling past the limits. * Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe, so that they can be invoked on the script thread. * Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton. and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.	2017-12-07 17:08:13 -08:00
Dante Ruiz	32fca16c85	fix radius equiping	2017-12-06 14:16:32 -08:00
Dante Ruiz	bbc022da2d	fix-far-to-equip	2017-12-05 14:09:46 -08:00
Dante Ruiz	eaa049863d	Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equipping	2017-11-30 14:49:24 -08:00
Dante Ruiz	db374b8c6d	fixing adjusting equipped entities	2017-11-30 14:49:06 -08:00
Dante Ruiz	982fad5050	fix laser interaction on HUD in HMD mode	2017-11-29 10:42:35 -08:00
Brad Hefta-Gaub	068b93fc30	Merge pull request #11838 from druiz17/fix-grabbing ... fixing setting incorrect parent when grabbing entities	2017-11-27 08:27:42 -08:00
Dante Ruiz	56972d1547	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing	2017-11-21 13:09:45 -08:00
Dante Ruiz	a201312dcf	re-added fix that when into master that this branch breaks	2017-11-20 13:10:35 -08:00
Brad Hefta-Gaub	95f59b0ab8	Merge pull request #11844 from druiz17/stylus-near-grab ... allow near grabbing of entities while stylus module is running.	2017-11-17 17:33:54 -08:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -08:00
Dante Ruiz	8f6c781014	Merge pull request #11831 from misslivirose/feat/scale-emit-hands ... Emit avatar scale changed signal when scaled with hand controllers	2017-11-17 11:55:31 -08:00
Dante Ruiz	4bbf2ff482	near grab entity while stylus is showing	2017-11-17 11:32:02 -08:00
Dante Ruiz	b66153b9cb	fixing setting incorrect parent	2017-11-16 15:07:00 -08:00
Dante Ruiz	f6a74cc80e	fixing merge conflicts	2017-11-16 10:04:36 -08:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
Liv Erickson	dda32f1987	Emit scale changed signal when scaled with hand controllers	2017-11-16 09:26:42 -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
Dante Ruiz	9564b7567b	fixing tablet in 3d person	2017-11-15 13:39:21 -08:00
Dante Ruiz	b026cfc42f	make sure teleport pointers are deleted	2017-11-14 14:09:08 -08:00
Dante Ruiz	8779d52ad3	making requested changes	2017-11-14 13:04:09 -08:00
Dante Ruiz	416a47cfc7	adding controller haptic feedback to tablet onPress	2017-11-14 09:34:17 -08:00
Dante Ruiz	b779c33a1b	fixed lockEndUUID offset for scripts	2017-11-13 16:42:16 -08:00
Dante Ruiz	6173c33b51	fixing merge conflict	2017-11-13 15:02:25 -08:00
Dante Ruiz	132b33dbe7	disable stylus pointer when not being used	2017-11-13 14:53:54 -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
Dante Ruiz	7613bddefa	fixing some issues with hud module	2017-11-13 14:26:34 -08:00
Dante Ruiz	5852224a31	clean up code and finialize changes	2017-11-13 13:37:53 -08:00
Dante Ruiz	43c6d71236	fix stylus module	2017-11-10 17:28:55 -08:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Dante Ruiz	ef55e3181d	moveing controllerDispatchaer pointers to pointerUtils.js	2017-11-09 16:48:52 -08:00
Dante Ruiz	86439eff07	fixing merge conflict	2017-11-09 13:07:55 -08:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08: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	3e9eaa727b	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-06 16:39:10 -08:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
Dante Ruiz	b6e3262164	removing the last remaining laserPointers	2017-11-02 11:31:13 -07:00
Dante Ruiz	0580e23686	fixed edit mode and allow to scroll off tablet	2017-11-01 15:16:02 -07:00
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Dante Ruiz	abb6f786fa	added homebutton message and scripts cleanup	2017-11-01 11:03:48 -07:00
Dante Ruiz	cde5208151	fixing merge conflict	2017-11-01 08:56:55 -07:00
SamGondelman	5a7298f15b	Merge remote-tracking branch 'upstream/master' into pointers	2017-10-31 17:33:52 -07:00