320 commits

Author	SHA1	Message	Date
David Back	ad85e2b053	pre PR adjustments	2018-04-16 13:12:33 -07:00
David Back	78c0ec5770	remove animations	2018-04-16 12:56:22 -07:00
Dante Ruiz	7243160dac	making requested changes	2018-04-11 14:42:26 -07:00
Dante Ruiz	ba9d5d18bc	make requested changes	2018-04-11 13:30:21 -07:00
David Back	59971869f5	desktop equip	2018-04-10 19:06:27 -07:00
Dante Ruiz	447163bd07	clean up scripts	2018-04-10 09:23:40 -07:00
Dante Ruiz	2e1ebac03f	clean up functionality	2018-04-09 18:07:03 -07:00
Dante Ruiz	1113202a90	reverting file	2018-04-09 16:51:20 -07:00
Dante Ruiz	2c20593b6d	editing equip code	2018-04-06 16:30:45 -07:00
Dante Ruiz	fd47832857	saving changes	2018-04-06 11:47:09 -07:00
Dante Ruiz	07b1a6be01	saving work	2018-04-06 11:01:40 -07:00
Dante Ruiz	893832f4c7	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-05 16:01:36 -07:00
Dante Ruiz	cc341e8ad7	highlight nearby entities	2018-04-05 15:38:56 -07:00
Dante Ruiz	42149e295d	editing seletion style	2018-04-04 12:55:28 -07:00
Zach Fox	b641f87792	Merge pull request #12778 from zfox23/MS13792 ... Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-04 09:31:33 -07:00
Dante Ruiz	c9c3d8f332	adding entity selection for far grabbing	2018-04-04 08:07:35 -07:00
Zach Fox	5f47d51171	Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-03 15:35:46 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
Dante Ruiz	16749df83a	fix highlighting edge case	2018-03-30 14:14:13 -07:00
Dante Ruiz	3d7f7f0e62	fix parent tree grabbing	2018-03-27 14:05:43 -07:00
John Conklin II	3f751bb5ca	Merge pull request #12546 from druiz17/fix-hyperlink ... Fix hyperlink when far/near grabbing enitities	2018-03-05 08:23:51 -08:00
Dante Ruiz	d12a4f0c18	little change	2018-03-02 14:30:02 -08:00
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -08:00
Dante Ruiz	05fb3cfd9a	fixing hyper link for entities	2018-03-02 14:03:24 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
Andrew Meadows	27c6e7915e	purge LaserPointers refs from scripts that don't use it	2018-03-01 08:43:30 -08:00
David Rowe	b1f49be790	Merge branch 'master' into 21742 ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 10:04:32 +13:00
Dante Ruiz	0dac851def	fixing case when grabbed target is destroyed	2018-02-08 17:08:51 -08:00
David Rowe	adb6f66a05	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
Dante Ruiz	601914180d	fixing teleport module for sit script	2018-02-05 11:52:35 -08:00
Seth Alves	c4f57877dd	if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright	2018-01-31 10:06:20 -08:00
John Conklin II	455090d2b9	Revert "Display both lasers on tablet and Web surfaces"	2018-01-19 15:15:52 -08:00
John Conklin II	db5bf68431	Merge pull request #12203 from ctrlaltdavid/21703 ... Display both lasers on tablet and Web surfaces	2018-01-19 15:15:44 -08:00
David Rowe	45bc6b8dab	Dominant hand gets the highlight if both start pointing simultaneously	2018-01-19 16:41:23 +13:00
David Rowe	e0e6fc711b	Replace Pointers API function setNonHoverItems() with setDoesHover()	2018-01-19 16:05:09 +13:00
Dante Ruiz	d88ff701b5	reduce calls to isPointOnDesktopWindow	2018-01-18 10:48:35 -08:00
David Rowe	403dd3d7d0	Only first laser highlights	2018-01-18 22:31:12 +13:00
David Rowe	5878e36ea8	Display both lasers	2018-01-18 14:24:23 +13:00
Dante Ruiz	fd83e00df4	fix tablet interaction and far grab functionallity	2018-01-08 11:30:21 -08:00
Zach Fox	0c38a5598f	Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection ... Fix bugs related to inspecting entities with hand controllers	2018-01-05 15:50:00 -08:00
David Rowe	5431b7137b	Code review	2018-01-06 08:27:24 +13:00
David Rowe	67eb282815	Don't swap hands if both triggers are squeezed	2018-01-05 12:12:36 +13:00
David Rowe	27bed8d1f1	Tidying	2018-01-05 11:05:49 +13:00
David Rowe	fb09a9724e	Change laser hand with trigger squeeze	2018-01-05 11:04:09 +13:00
David Rowe	9f7a2b18e6	Use laser from dominant hand if both hands are pointing at the tablet	2018-01-05 10:04:39 +13:00
David Rowe	02f4085368	Fix magic number	2018-01-05 09:00:53 +13:00
David Rowe	6095a90e69	Don't display default lasers when Shapes app is active	2018-01-04 21:09:38 +13:00
David Rowe	6c16fcfe65	Fix tablet laser when Shapes app is running	2018-01-04 16:37:20 +13:00
David Rowe	efa6f1f02f	Use "Prefer Stylus Over Laser" setting	2018-01-04 15:00:17 +13:00
Zach Fox	ff4f582c7d	Thanks Howard	2018-01-03 17:23:35 -08:00
Zach Fox	8d4a6f01cb	Fix bugs related to inspecting entities with hand controllers	2018-01-03 16:03:37 -08:00
David Rowe	6e43497e14	Merge tag 'RELEASE-7602' into 21661 ... Jenkins Git plugin tagging with RELEASE-7602	2018-01-03 16:46:10 +13: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	b9f60aff2a	fix-edit	2017-11-30 13:22:26 -08:00
Dante Ruiz	024dbcd712	fix scrolling	2017-11-30 09:07:19 -08:00
Dante Ruiz	982fad5050	fix laser interaction on HUD in HMD mode	2017-11-29 10:42:35 -08:00
Dante Ruiz	70820e6075	laser allways on prototype	2017-11-28 15:37:36 -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