581 commits

Author	SHA1	Message	Date
r3tk0n	c9ade7ccb8	Add grip to fargrab.	2019-03-15 16:09:01 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
Shannon Romano	e776cf2627	Merge pull request #15127 from danteruiz/fix-websurface-module ... Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called	2019-03-07 16:04:57 -08:00
danteruiz	87cfbe48d1	fix webSurfaceIntersection	2019-03-07 13:11:18 -08:00
danteruiz	272ca5dc1c	disable entity scaling	2019-03-05 16:23:40 -08:00
r3tk0n	12ffa41984	Prevent HUD and Web Surface lasers from interrupting FarGrab.	2019-03-02 13:55:06 -08:00
Jason Najera	d41c2d296b	Merge pull request #15043 from r3tk0n/fargrab-manipulation ... FarGrab Entity Rotation with Off-Hand	2019-03-01 14:42:59 -08:00
danteruiz	f715dbe243	fix tablet scaling	2019-02-28 13:32:12 -08:00
r3tk0n	a72b02cd25	Clean up code and add comments.	2019-02-28 13:08:05 -08:00
r3tk0n	3a5698236b	Swap FarGrab from superpower to alternative version from PR#15043	2019-02-27 10:57:35 -08:00
r3tk0n	1ec887ffc2	Fix teleportation play area indicator not hiding on cancel.	2019-02-27 10:51:38 -08:00
r3tk0n	fcdfae5a67	Fix notion of hand dominance.	2019-02-27 08:39:35 -08:00
r3tk0n	7c515ccd45	Add 2x rotation multiplier.	2019-02-26 19:16:45 -08:00
r3tk0n	ca740c6254	Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab.	2019-02-26 18:44:00 -08:00
r3tk0n	52d80476a8	Fix activation criteria.	2019-02-26 17:55:16 -08:00
r3tk0n	9559f9ffd3	Add off-hand controller manipulation to fargrab.	2019-02-26 17:52:18 -08:00
r3tk0n	2077e012db	Fix case of repeated manipulations with fargrab.	2019-02-26 15:00:44 -08:00
r3tk0n	f3b65d06ad	Fix frame of reference for rotations.	2019-02-26 12:46:46 -08:00
r3tk0n	2a04d2b9c5	Closer...	2019-02-26 12:39:51 -08:00
r3tk0n	0b651a8d63	Fix fargrab rotation with dominant hand, need to fix activation criteria next.	2019-02-26 11:29:06 -08:00
r3tk0n	52b62784d6	Incremental, broken progress.	2019-02-25 14:10:48 -08:00
r3tk0n	a66c76bf38	Fixing typos.	2019-02-25 13:47:31 -08:00
r3tk0n	d79681470e	Saving changes before merging master...	2019-02-25 13:10:25 -08:00
r3tk0n	c6a3496b25	Add utility functions for adjusting target rotation and position.	2019-02-24 12:36:44 -08:00
r3tk0n	58906d84eb	Add grip button polling.	2019-02-21 15:22:21 -08:00
r3tk0n	ebbf48a11b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 12:02:50 -08:00
r3tk0n	03058775f6	Remove debug prints.	2019-02-19 11:27:13 -08:00
r3tk0n	f52b096bb9	Change far grab to chorded input 'superpower'	2019-02-19 11:26:42 -08:00
SamGondelman	7677e3bf44	just in case	2019-02-16 20:41:57 -08:00
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
r3tk0n	1751864042	Fix this references in module run function.	2019-01-29 16:13:11 -08:00
r3tk0n	4d2ee07512	Change deactivation criteria as per conversation between Joshua and Mukul.	2019-01-29 12:02:23 -08:00
r3tk0n	80abfbab5e	Modify teleport to 'superpower' spec.	2019-01-24 14:22:01 -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