1206 commits

Author	SHA1	Message	Date
Dante Ruiz	f4a9acab92	Merge pull request #11833 from druiz17/controllerDispatcher-interval ... change controllerDispatcher to setTimeOut update	2017-12-08 16:36:46 -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	0286f4646a	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-12-07 16:19:03 -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	6fd8fb1e5b	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-11-30 11:52:41 -08:00
Dante Ruiz	cbaf59d99e	disable stylus	2017-11-30 11:13:17 -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	9622fef149	fix controllerDispatcher time step	2017-11-21 09:48:19 -08:00
Dante Ruiz	5bb23ef1df	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-11-21 09:30:41 -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	cabe3819a3	fixing crash	2017-11-17 10:20:34 -08:00
Dante Ruiz	b66153b9cb	fixing setting incorrect parent	2017-11-16 15:07:00 -08:00
Dante Ruiz	c82798673f	change controllerDispatcher to setTimeOut update	2017-11-16 10:42:28 -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	54075d4c9a	make hud laser relative to camera	2017-11-14 13:09:16 -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
Seth Alves	ce7d0c324b	Merge pull request #11761 from ctrlaltdavid/21593 ... Don't move or rotate entities if Alt or Meta keys are pressed	2017-11-07 09:33:21 -08:00
Dante Ruiz	bdd31b63ed	update functions call names to match pointer API changes	2017-11-06 17:23:40 -08:00
Dante Ruiz	3e9eaa727b	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-06 16:39:10 -08:00
David Rowe	60319e8d53	Don't move or rotate entities if Alt or Meta keys are pressed	2017-11-07 13:35:31 +13: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
Dante Ruiz	f44025a8b1	completely removed non-need laserPointers	2017-10-31 15:57:57 -07:00
Dante Ruiz	30332c3d00	removing more laserPointers	2017-10-31 14:13:42 -07:00
Brad Hefta-Gaub	fbcd813d7b	Merge pull request #11694 from ElderOrb/FB8315 ... 8315 Stylus appears in wrong place on hand	2017-10-30 18:00:56 -07:00
Dante Ruiz	e5600e4f1e	one universal controller pointer for all modules	2017-10-30 16:58:14 -07:00
Dante Ruiz	bea0df8e60	implemented remebering equiping entities offset	2017-10-27 14:46:04 -07:00
SamGondelman	a44e8efb99	merge from master	2017-10-26 12:14:53 -07:00
beholder	ddd25da430	8315 Stylus appears in wrong place on hand	2017-10-26 19:39:15 +03:00
Dante Ruiz	2ec8f3f625	made non-dynamic entities collisionless during far-grab	2017-10-25 11:29:32 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -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
Brad Hefta-Gaub	26ea8bea6a	Merge pull request #11612 from highfidelity/pointers ... Fix tablet intersection bug and start of Pointer migration work (WIP)	2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub	e2ccfb84f9	Merge pull request #11626 from Delanir/BubbleScaleMaster ... 7429 IPD Secondary Task List: bubble.js Scale	2017-10-19 09:31:15 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
luiscuenca	6e8756e8af	Debug mode has been turned off	2017-10-18 15:40:03 -07:00
Daniela	e9f3dd6e44	Merge BubbleScale for IPD with hifi master.	2017-10-18 22:29:12 +01:00
SamGondelman	58172cfbd4	merge from master	2017-10-17 18:05:59 -07:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
SamGondelman	429905de51	update scripts to use ignoreItems, fix caching bug	2017-10-16 15:52:17 -07:00
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00
Seth Alves	fe9f142bf6	Merge pull request #11562 from druiz17/fix-release-grab ... include release message to controller modules	2017-10-13 13:06:18 -07:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
druiz17	6799b9ca13	fix stylus	2017-10-13 09:34:08 -07:00
druiz17	67944c40a1	Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab	2017-10-11 09:13:01 -07:00
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
druiz17	e77ac9fd10	include release message	2017-10-10 13:47:33 -07:00
druiz17	013e15c9a2	made requested changes	2017-10-10 10:54:56 -07:00
druiz17	a179df29fb	mouse grab non-dynamic entities	2017-10-10 10:31:40 -07:00
druiz17	d0eb6a3ad0	remove comments	2017-10-10 09:45:41 -07:00
druiz17	003395b256	removing whitespace	2017-10-10 09:43:02 -07:00
druiz17	fc41155ce1	saving work	2017-10-10 09:17:01 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00
druiz17	347645329e	fixing laser staying on in edit mode	2017-10-05 09:11:02 -07:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
Clément Brisset	74fd69ac2d	Merge pull request #11523 from Atlante45/new-master ... RC56 into Master	2017-10-04 15:17:52 -07:00
druiz17	9de1ca4e1a	allow farGrab module to run when stylus is visible	2017-10-04 15:04:27 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
druiz17	13feec89c2	remove update stylus	2017-10-03 16:12:37 -07:00
druiz17	ad9677f63e	fixing grabbing and tablet bugs	2017-10-03 16:11:51 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
druiz17	6b3d89d18f	fix hudlaser module	2017-10-03 14:13:37 -07:00
druiz17	33e9a71000	grab attachments	2017-10-03 12:51:51 -07:00
Howard Stearns	22f0ef33ed	Merge pull request #11496 from howard-stearns/certificate-properties ... Certificate properties	2017-10-03 10:06:48 -07:00
David Rowe	5145107f8c	2D overlays can no longer be lasered	2017-10-03 21:36:40 +13:00
David Rowe	a59d590111	ESLint	2017-10-03 13:33:20 +13:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -07:00
Howard Stearns	930832bb19	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-10-02 09:44:29 -07:00
David Rowe	829cc8e5e6	Merge branch 'master' into vr-edit-a	2017-10-02 17:08:27 +13:00
Anthony J. Thibault	7dfa80f666	Bug fix for offset of animated parts of oculus touch controller display ... Ensure position/rotations are updated with a consistent scale and are animated correctly as the controller values change.	2017-10-01 17:52:59 -07:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Howard Stearns	73c8da99dc	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-29 16:46:43 -07:00
Anthony J. Thibault	9273e02497	Bug fix for offset of animated parts of oculus touch controller display ... Ensure position/rotations are updated with a consistent scale and are animated correctly as the controller values change.	2017-09-29 14:01:50 -07:00
David Rowe	75365847a1	Merge branch 'master' into vr-edit-a	2017-09-30 09:30:38 +13:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Seth Alves	7645808694	Merge pull request #11479 from druiz17/more-bugs ... fixing grabbing and tablet bugs	2017-09-28 20:02:47 -07:00
Howard Stearns	d1350a03c2	working checkpoint, but with a lot of debug/development stuff	2017-09-28 17:06:07 -07:00
druiz17	45b8bfdb1f	disbale grab.js in HMD	2017-09-28 16:17:39 -07:00
druiz17	1947f2ba99	remove update stylus	2017-09-28 13:23:28 -07:00
druiz17	3b05317db6	fixing grabbing and tablet bugs	2017-09-28 11:18:40 -07:00
Daniela	13eb7db462	Change teleport.js to update render state more frequently.	2017-09-28 16:12:20 +01:00
David Rowe	30c4a22441	Merge branch 'master' into vr-edit-a	2017-09-28 16:10:26 +13:00
Seth Alves	3016ce0a2b	Merge pull request #11470 from sethalves/fix-grab-vs-trigger ... set grabbable and other checkboxes correctly if userData is blank	2017-09-27 15:24:37 -07:00
druiz17	cea3c002dd	improving far rotate	2017-09-27 11:47:26 -07:00
Seth Alves	eb6c99456d	Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger	2017-09-27 10:01:24 -07:00
David Rowe	6b3b2beae0	Merge branch 'master' into vr-edit-a	2017-09-27 15:34:52 +13:00
Seth Alves	ae42d56cd6	Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale ... Teleport.js: can now teleport small distances with small avatar scale	2017-09-26 19:05:14 -07:00
Seth Alves	ce3e5eb1a3	set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab	2017-09-26 18:56:27 -07:00
Seth Alves	f384cde471	Merge pull request #11467 from sethalves/fix-near-trigger ... Fix near trigger	2017-09-26 17:27:05 -07:00
Seth Alves	8180acbffc	use same trigger test as in isReady	2017-09-26 16:29:22 -07:00
Seth Alves	a478506da3	Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger	2017-09-26 15:52:22 -07:00
Seth Alves	644532dd59	only send startNearTrigger once	2017-09-26 15:17:23 -07:00
druiz17	5a1242a1ac	fix spelling error	2017-09-26 15:06:31 -07:00
druiz17	76c1fe688c	fix auto dropping	2017-09-26 14:52:01 -07:00
Anthony J. Thibault	a7cfb5d635	teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale	2017-09-26 14:21:25 -07:00
Anthony J. Thibault	c26d04dca1	Teleport.js: Fix message bugs, and made eslint clean ... * 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work * 'Hifi-Teleport-Disabler' message should now work	2017-09-26 13:58:00 -07:00
Seth Alves	a871a6db1d	Merge pull request #11430 from sethalves/fix-parent-grab ... Fix parent grab	2017-09-26 13:00:16 -07:00
Seth Alves	81f74f9297	Merge pull request #11444 from druiz17/module-handcontrollerPointer ... Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet	2017-09-26 12:21:03 -07:00
Seth Alves	216888aa03	Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab	2017-09-26 11:08:40 -07:00