155 commits

Author	SHA1	Message	Date
James B. Pollack	2b8ad51b41	cleanup orientation of	2015-11-11 18:07:05 -08:00
James B. Pollack	595c628c39	it works!	2015-11-11 17:32:03 -08:00
James Pollack	ffe9036755	debug	2015-11-11 14:51:20 -08:00
James B. Pollack	b6bb54da32	Merge branch 'master' into bow	2015-11-10 15:30:50 -08:00
James B. Pollack	8fc702485b	werk	2015-11-09 14:39:30 -08:00
Seth Alves	8a434c8ab1	don't attempt to near-grab things that aren't physical	2015-11-09 14:10:26 -08:00
James B. Pollack	b496240283	Merge branch 'master' into bow	2015-11-09 10:54:54 -08:00
Seth Alves	c4194f2359	don't try to grab polylines. set wantTrigger on various whiteboard parts	2015-11-05 13:26:23 -08:00
James B. Pollack	87503ca4c6	Merge branch 'master' into bow	2015-11-05 11:00:51 -08:00
Seth Alves	4a3b434fd4	change grabbing-non-colliding to trigger. fix whiteboard and some other scripts	2015-11-05 10:35:02 -08:00
James B. Pollack	7dc40548d3	Merge branch 'master' into bow	2015-11-05 10:21:37 -08:00
Seth Alves	05a977e31b	get rid of code that computes release velocity	2015-11-04 16:26:30 -08:00
Seth Alves	adb9118dc1	don't set release velocity	2015-11-04 16:21:02 -08:00
James B. Pollack	9b7bdca73a	merge handcontroller	2015-11-04 14:12:00 -08:00
Seth Alves	1cbe6c4463	don't attempt to grab particles or zones	2015-11-04 13:59:37 -08:00
Seth Alves	c2f9a49598	don't grab light	2015-11-04 11:15:57 -08:00
Seth Alves	1e498a41f0	rework search logic	2015-11-04 10:46:20 -08:00
James B. Pollack	46294e3e26	Merge branch 'master' into bow	2015-11-03 20:10:28 -08:00
Atlante45	d8797ef9d7	Initialize relativePosition/Rotation	2015-11-03 16:07:37 -08:00
Stephen Birarda	8346ce27b3	allow a non-colliding grab of locked entities	2015-11-03 14:22:41 -08:00
James B. Pollack	f0fbd67e93	merge	2015-11-03 13:00:25 -08:00
Seth Alves	27b239176f	fix grab	2015-11-03 10:16:56 -08:00
Seth Alves	fe2c0effd0	oops left debug on	2015-11-02 16:17:46 -08:00
Seth Alves	0a5f43bba7	fix up boolean test	2015-11-02 16:16:13 -08:00
Seth Alves	181901ed19	distance grab works better with hmd on	2015-11-02 14:42:28 -08:00
Brad Hefta-Gaub	286905c20c	Merge pull request #6250 from jherico/peek ... Adding peek support for endpoints	2015-10-31 16:09:27 -07:00
Seth Alves	9346366fc5	fix grab script	2015-10-31 14:28:54 -07:00
Brad Davis	abbfe15395	Adding peek support for endpoints	2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub	46f9a432ab	fix handControllerGrab.js	2015-10-31 14:21:50 -07:00
Seth Alves	896ed3927c	merge from upstream	2015-10-30 19:17:43 -07:00
Seth Alves	944f0965c0	some refactoring and a bug fix -- grab script can throw things again	2015-10-30 16:35:50 -07:00
Seth Alves	cf83ca22bb	change how kinematic objects get data back to entity when an action is active	2015-10-30 15:30:54 -07:00
Seth Alves	b102081f2f	upon release, set velocity after returning entity to being dynamic	2015-10-30 11:35:51 -07:00
Seth Alves	93503d0a21	make kinematic grab set entities kinematic in bullet and update entity position	2015-10-30 11:03:13 -07:00
James B. Pollack	ad9cfbab50	end of day	2015-10-29 17:24:43 -07:00
James B. Pollack	342760de56	Merge branch 'master' into bow	2015-10-29 15:58:57 -07:00
James B. Pollack	48a295f4bc	werk	2015-10-29 15:24:04 -07:00
James B. Pollack	7166c6ddd2	through arrow in notch with rotation	2015-10-29 12:23:32 -07:00
James B. Pollack	028ea584b8	updating bow	2015-10-29 11:23:03 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD ... Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
James B. Pollack	8695963dd1	end of day	2015-10-28 19:10:16 -07:00
James B. Pollack	24a5cdc19e	through notching the arrow	2015-10-28 14:00:37 -07:00
Seth Alves	8d0aaed41a	fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'	2015-10-26 13:50:21 -07:00
James B. Pollack	29de3581dd	end of day	2015-10-23 17:39:03 -07:00
Brad Hefta-Gaub	060f87d14a	CR feedback	2015-10-23 17:33:45 -07:00
Brad Hefta-Gaub	9ba1b800d9	CR feedback	2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub	090dc5409b	CR feedback	2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub	ed20e7d209	CR feedback	2015-10-23 17:14:13 -07:00
Brad Hefta-Gaub	6b795364c8	make handGrab treat shoulder bumbers and triggers as merged control	2015-10-23 16:30:40 -07:00
Brad Hefta-Gaub	3e7364608b	make handControllerGrab.js work with new API	2015-10-22 09:17:29 -07:00