134 commits

Author	SHA1	Message	Date
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
Seth Alves	f51f17b267	Merge pull request #5775 from ericrius1/paintCan ... Paint can	2015-09-11 12:34:44 -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
Philip Rosedale	93261976c0	Merge pull request #5763 from hyperlogic/tony/squeeze-hands-improvements ... Improvements to squeezeHands.js	2015-09-10 15:34:52 -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
Anthony J. Thibault	839047e583	Improvements to squeezeHands.js ... * Account for controller dead spot. This helps us to see first few frames of the opening animation and the last few frames of the closing animation * Added a small amount of smoothing on the triggers * Fixed bug when controllers were closed quickly and the animation frame was never getting set, because frame and lastFrame were equal. * Changed animation urls to Ozan's latest.	2015-09-09 21:46:35 -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
Brad Davis	a8b5336e02	Merge pull request #5709 from ZappoMan/breakdanceToy ... next wave of breakdance work	2015-09-03 14:55:04 -07:00
Brad Hefta-Gaub	44c554895d	next wave of breakdance work	2015-09-03 14:33:25 -07:00
ericrius1	ebe5818c84	relative path	2015-09-03 14:09:01 -07:00
ericrius1	fa42334430	added userData manipulations to grab script	2015-09-03 11:30:44 -07:00
ericrius1	d303c7e119	only add actions to physical objects	2015-09-02 16:45:50 -07:00
ericrius1	1e6198cf59	update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js	2015-09-02 11:29:37 -07:00
Brad Hefta-Gaub	542b124146	first cut at breakdance toy	2015-08-27 16:12:33 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
SamGondelman	b77de1b598	added fists to toybox	2015-08-07 18:07:14 -07:00
SamGondelman	23fea1f221	working on toybox script, squeezeHands, and default mappings	2015-08-07 16:59:50 -07:00
Sam Gondelman	3256e30f02	toybox script	2015-08-05 18:54:08 -07:00
Howard Stearns	5114f82dca	Fix https://app.asana.com/0/32622044445063/38213714069516	2015-06-23 12:07:01 -07:00
ericrius1	cf579ab275	fixed bullet size to be smaller	2015-06-23 09:52:29 -07:00
Howard Stearns	e6bafb9bf1	Draggable toolBar.js, with persistence, and update some scripts for it.	2015-06-11 16:19:54 -07:00