549 commits

Author	SHA1	Message	Date
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
Seth Alves	c8e9bff03a	fix releaseGrab call on grabbed entity when a nearGrab ends	2019-01-17 13:34:36 -08:00
Seth Alves	b5326936d8	grab.js will now ignore click-to-equip entities	2019-01-15 14:17:51 -08:00
Seth Alves	2515c7f73e	remove old-style grabbing scripts	2019-01-15 13:43:52 -08:00
Seth Alves	b2f25629eb	don't allow scaling of others' equipped entities	2019-01-03 08:19:18 -08:00
Seth Alves	bf46960dc3	fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities	2019-01-03 08:17:52 -08:00
Seth Alves	9bf9e379a3	fix far-grab initial rotation and entity-method call	2019-01-03 08:17:52 -08:00
Seth Alves	0967a94557	get grabbing and scaling to get along better	2019-01-03 08:17:52 -08:00
Seth Alves	6a547d042c	port over PR-14276	2019-01-03 08:17:52 -08:00
Seth Alves	1c1e648b8b	port over PR-14429	2019-01-03 08:17:52 -08:00
Seth Alves	70b68294ff	port over PR-14464	2019-01-03 08:17:52 -08:00
Seth Alves	6f25c59a0c	turn-off nearEntityGrab when scaleEntity is active	2019-01-03 08:17:52 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
Dante Ruiz	089a223c2d	more CR changes	2018-12-12 15:29:01 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
Brad Hefta-Gaub	1e9faa7754	Merge pull request #14276 from ctrlaltdavid/M19345 ... Make create apps not grab tablet if editing an entity with hand	2018-12-09 17:21:10 -08:00
David Rowe	dc05cdee5a	Merge branch 'master' into M17406 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabEntity.js	2018-11-30 09:44:09 +13:00
Seth Alves	87e4c17194	Merge pull request #14429 from danteruiz/disable-highlighting ... Remove entity highlighting	2018-11-29 09:04:56 -08:00
David Rowe	c96cd422e1	Fix near parent grab tear away calc for avatar scale	2018-11-24 11:58:40 +13:00
David Rowe	f2abf8e398	Debounce haptic pulses at start of near parent grab	2018-11-24 11:43:05 +13:00
David Rowe	29c268df5a	Remove extraneous grab entity haptic pulses	2018-11-24 11:38:54 +13:00
David Rowe	f1dad3c465	Add hystersis between near parent grabbing and tearing away	2018-11-24 08:35:02 +13:00
David Rowe	1362e7f361	Fix near parent grab entity tear away distance calc	2018-11-24 08:26:54 +13:00
David Rowe	5e51ba051a	Improve code responsibilities	2018-11-22 11:12:22 +13:00
David Rowe	c3a0805db1	Make far grab ignore tablet while grabbing an entity	2018-11-21 10:28:46 +13:00
David Rowe	44efd18882	Make Create and Shapes lasers ignore tablet while editing	2018-11-21 08:38:30 +13:00
John Conklin II	87cac67c75	Merge pull request #14280 from ElderOrb/FB17381 ... FB17381 - Reticle.setVisible isn't working	2018-11-20 09:53:52 -08:00
Dante Ruiz	d6fbcb1668	remove entity highlighting	2018-11-19 11:04:09 -08:00
David Rowe	b24c482743	Terminate Create far grab etc. upon laser intersecting tablet	2018-11-16 16:29:57 +13:00
David Rowe	f2868fec3f	Merge branch 'master' into M19345	2018-11-16 09:11:11 +13:00
Seth Alves	7ffba9d987	Merge pull request #14204 from ctrlaltdavid/M12661 ... Fixes for collisionless entities	2018-11-13 09:42:07 -08:00
John Conklin II	0370c60398	Merge pull request #14358 from AndrewMeadows/fix-capsuleY ... Case 18436: consistent handling of CapsuleShape dimensions	2018-11-12 15:25:42 -08:00
Jeff Clinton	ee9154a801	Merge pull request #14341 from sethalves/fix-mouse-equip ... only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand	2018-11-09 12:54:36 -08:00
Jeff Clinton	3d01949e43	Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic ... Case 19495: zero velocities of non-dynamic entities on nearGrab release	2018-11-09 10:10:49 -08:00
David Rowe	a34e1f69e0	Merge branch 'master' into M19345 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabOverlay.js	2018-11-09 14:26:29 +13:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Andrew Meadows	b38c263e60	use correct capsule dimensions in teleport.js	2018-11-06 12:44:14 -08:00
Seth Alves	a94fd2a1c9	only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand	2018-11-03 13:14:08 -07:00
Alexander Ivash	dcf20d2a15	FB17381 - Reticle.setVisible isn't working	2018-11-01 22:39:02 +05:30
Andrew Meadows	225e8e0556	always zero velocity on far-grab release of non-dynamic	2018-10-31 10:20:21 -07:00
Andrew Meadows	90e944f130	always zero velocity on near-grab release of non-dynamic	2018-10-30 16:20:33 -07:00
David Rowe	791ee04aea	Merge branch 'master' into M12661	2018-10-30 13:33:53 +13:00
Seth Alves	b8f1c96685	rats	2018-10-25 07:47:16 -07:00
Seth Alves	b93807b1a7	remove conversion code from equipEntity.js	2018-10-25 07:47:16 -07:00
David Rowe	1460e43f6e	Make tablet highlight not display if editing an entity with hand	2018-10-25 15:04:59 +13:00
David Rowe	0eead13fb9	Make Create not grab tablet if editing an entity with hand	2018-10-25 15:03:47 +13:00