81 commits

Author	SHA1	Message	Date
Eric Levin	0b92bc11f6	fixed spacing	2015-10-14 13:26:10 -07:00
ericrius1	eb7b720945	got rid of whitespace	2015-10-14 13:24:22 -07:00
ericrius1	6cd9bf407f	Reverted handControllerGrab	2015-10-14 11:40:06 -07:00
ericrius1	7fb6b7e272	Reverted hand controller	2015-10-14 11:31:09 -07:00
ericrius1	20d1a2440c	Ignoring unknown types in collision	2015-10-14 11:15:49 -07:00
ericrius1	04f0d792bb	Reverted grab back to 5 hz	2015-10-12 17:36:53 -07:00
ericrius1	33ff21f376	Got rid of debug message in handControllerGrab script	2015-10-12 17:36:07 -07:00
ericrius1	f93b1d3325	Correctly whitelisting entities for ray picking	2015-10-12 17:05:34 -07:00
ericrius1	d01dda9c81	Adding in functionality to include only specified Ids in ray picking	2015-10-12 14:40:11 -07:00
Seth Alves	5c95306e8e	merge from upstream	2015-10-10 09:34:13 -07:00
Seth Alves	7824d03e11	grab script picks 5x per second rather than 60x	2015-10-09 17:56:32 -07:00
Seth Alves	c6c44e8b81	add a userdata flag that allows toggling of the ignoreForCollisions entity property when an item is held.	2015-10-09 15:42:30 -07:00
ericrius1	aac372cc8a	Fixed styling errors	2015-10-08 09:53:06 -07:00
ericrius1	efc2dfb68f	Added grab far events for non physical objects	2015-10-07 18:06:37 -07:00
Seth Alves	7f8411d947	reference count grabs on an entity	2015-10-05 14:15:38 -07:00
Seth Alves	635c83dad1	reset gravity and ignore-for-collisions after grabs have released	2015-10-05 13:39:01 -07:00
Seth Alves	7f84e882c5	attempt to keep ignoreForCollisions the same before and after grab	2015-10-05 13:06:39 -07:00
Seth Alves	8f924f0be4	merge from upstream	2015-10-05 13:05:37 -07:00
Seth Alves	26310d8ce4	kill gravity in near-held objects	2015-10-02 17:54:09 -07:00
Seth Alves	89c848d8c8	fix up kinematic hold	2015-10-02 17:14:53 -07:00
Seth Alves	c0e8b02a2f	fix what happens when a distance grab is blocked because someone else already has it	2015-10-02 12:25:34 -07:00
Seth Alves	5b970e6b1a	try to fix double-distance-grabbing lockout	2015-10-02 11:43:19 -07:00
Seth Alves	2700529b33	lower action lifetime	2015-10-01 10:41:43 -07:00
Seth Alves	d4f954a0e2	allow more than one near-grab on an object	2015-10-01 10:25:30 -07:00
Seth Alves	cd2a1542e0	increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something	2015-09-30 16:05:16 -07:00
Seth Alves	4e057e5ada	increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something	2015-09-30 16:03:54 -07:00
Seth Alves	dd0a16df04	don't leave search state if we intersect something that someone else is already grabbing	2015-09-30 14:19:59 -07:00
Seth Alves	b417abc3de	try again on string startswith	2015-09-30 14:16:07 -07:00
Seth Alves	f746a970de	don't grab something if someone else is already grabbing it	2015-09-30 14:03:10 -07:00
Seth Alves	7c6846c260	add lifetime and tag arguments to actions	2015-09-30 13:09:41 -07:00
Seth Alves	472ff89f48	rearrange when avatar collisions are adjusted	2015-09-29 15:52:38 -07:00
Seth Alves	8f2f14c9e5	keep track of state of avatar-collisions menu-item with global variables rather than per object ones	2015-09-29 15:30:24 -07:00
Seth Alves	2ba686ed89	cleanups	2015-09-29 15:11:52 -07:00
Seth Alves	d554eb8db9	avatar collisions are off during a grab	2015-09-29 15:09:25 -07:00
Seth Alves	b1a133e55c	working on disabling avatar collisions during grab	2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub	07515ce710	Merge pull request #5918 from PhilipRosedale/master ... Throw held objects with velocity from fingertip	2015-09-29 14:37:44 -07:00
unknown	006650f23b	Fix for PR comments	2015-09-29 14:34:23 -07:00
ericrius1	644687f330	releaseGrab event now triggered for non physical entities	2015-09-29 14:04:03 -07:00
Seth Alves	e9dd165b1d	try calling updateMotionBehaviorFromMenu	2015-09-29 14:00:22 -07:00
Seth Alves	f7b34f63c1	try calling updateMotionBehaviorFromMenu	2015-09-29 13:40:54 -07:00
Seth Alves	49da3c5034	disable avatar collisions while holding something	2015-09-29 13:24:03 -07:00
ericrius1	06194b6088	fixed formatting	2015-09-29 12:51:01 -07:00
ericrius1	35e4ec17ea	add which hand for near grab of non physical objects	2015-09-29 10:35:38 -07:00
unknown	56a0456f70	Adjust force multiplier and timestep	2015-09-28 16:49:55 -07:00
unknown	5c7cf76035	Distance grab works with walking and turning	2015-09-28 16:13:35 -07:00
unknown	5fc7965042	Throw held objects with velocity from fingertip	2015-09-28 13:04:58 -07:00
James B. Pollack	affb0253db	Update handControllerGrab.js ... added a semicolon to the end of a return statement	2015-09-28 10:26:52 -07:00
James Pollack	1f7914766c	Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false	2015-09-25 15:26:29 -07:00
James Pollack	fd43956502	re add allTouchedIDs object	2015-09-24 16:35:59 -07:00
James Pollack	8dacd736df	fix weird multi line thing	2015-09-24 15:27:26 -07:00