100 commits

Author	SHA1	Message	Date
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
James Pollack	9eb3b56e5d	Remove space before and after function calls, add spaces btw functions	2015-09-24 15:03:02 -07:00
James Pollack	37ecd18054	put distant grab inside of conditional	2015-09-23 17:44:28 -07:00
James Pollack	381a24951e	Update grab script to handle touching, better naming for non colliding grab functions	2015-09-23 16:56:46 -07:00
James Pollack	ba44390f79	Rename touch to grab non colliding	2015-09-23 13:20:21 -07:00
ericrius1	42a2125336	Only asking for needed props	2015-09-22 13:29:54 -07:00
ericrius1	b9db495ebf	Modified handControllerGrab script to trigger entity touch events for non-physical entities	2015-09-22 09:38:06 -07:00
Seth Alves	cee296e70c	keep object from rotating during local grab	2015-09-21 13:50:42 -07:00
Seth Alves	cfde86a7ea	tone down distance throwing	2015-09-18 17:07:10 -07:00
Seth Alves	236831d385	fix when releaseGrab is called	2015-09-18 16:28:15 -07:00
Seth Alves	5db3af3f4c	formatting	2015-09-18 15:58:47 -07:00
Seth Alves	5367de35c1	fix distance-grab throwing	2015-09-18 15:45:36 -07:00
Seth Alves	612e906a44	change the names of entityMethods which the grab script will call. adjust the release velocity multiplier	2015-09-18 15:09:05 -07:00
Seth Alves	d1a7aca7f0	add continue-distance-holding state. don't call callEntityMethod unless action creation works. increase distance-holding multiplier.	2015-09-18 14:45:49 -07:00
Seth Alves	c5716b715d	merge from upstream	2015-09-18 14:22:11 -07:00
Seth Alves	7a8cee4cc3	fix release velocity so throwing things works reliably	2015-09-18 14:13:08 -07:00
Brad Hefta-Gaub	0d37511071	add support for scripts to call methods on entity scripts	2015-09-18 14:06:38 -07:00
Seth Alves	b08f567999	put controller specific functions inside the controller object	2015-09-18 09:56:45 -07:00
Seth Alves	b8c8ea2b53	move magic numbers to constant variables, add some comments	2015-09-18 07:20:35 -07:00
Seth Alves	6d7b129b83	rework handControllerGrab.js	2015-09-17 23:15:18 -07:00
Seth Alves	f7193dbb97	if the intersection distance is small, use grab-mode rather than distant-grab-mode	2015-09-15 16:55:51 -07:00
Seth Alves	e650e40388	try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection	2015-09-15 11:32:56 -07:00
Seth Alves	7b5d6c20e9	double change in hand rotation before applying it to the object	2015-09-15 11:21:13 -07:00
Seth Alves	99b0046fc7	various adjustments	2015-09-15 10:43:17 -07:00
Seth Alves	d874c9b382	snip out tractor beam	2015-09-14 14:20:49 -07:00
Seth Alves	f4aad05621	reduce radius of hand-intersects-object test. fix lifetime of laser line	2015-09-14 14:07:16 -07:00
ericrius1	0a46db60ac	spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles	2015-09-11 12:01:01 -07:00
ericrius1	66a4ff752c	cleaning up lifetime calc	2015-09-10 09:01:51 -07:00
ericrius1	9ba681dd7f	fixed way lifetime on pointer entity is updated	2015-09-10 08:59:05 -07:00
ericrius1	5025030726	added lifetime to pointer, default grab behavior now honors objects initial position and rotation	2015-09-09 14:24:30 -07:00
ericrius1	572b120bf0	removed print statements	2015-09-08 15:57:31 -07:00
ericrius1	7133fc94f5	hydraGrab now grabs entities based on how they want to be grabbed (through setting of userData field with a key called spatialKey	2015-09-08 12:54:02 -07:00

Renamed from examples/controllers/hydra/hydraGrab.js (Browse further)