127 commits

Author	SHA1	Message	Date
Seth Alves	adb9118dc1	don't set release velocity	2015-11-04 16:21:02 -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
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
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
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD ... Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -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
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
Seth Alves	f85ef9267b	oops	2015-10-20 18:29:27 -07:00
Seth Alves	311254c395	require user-data to have wantsTrigger in it before non-colliding calls will happen	2015-10-20 18:26:12 -07:00
Seth Alves	7dcbb5849a	another bug	2015-10-20 17:44:12 -07:00
Seth Alves	ed480f651f	missed a line	2015-10-20 17:43:31 -07:00
Seth Alves	f16b62df83	- grab script: possible fix for line disappearing ... - grab script: go from 3 pickrays back to 1 - grab script: put "sphere" test back in, but with fixed distance test	2015-10-20 17:34:35 -07:00
James B. Pollack	8e1c3c32d1	additions to debug and also to handle some two handed situations	2015-10-20 16:24:17 -07:00
Brad Hefta-Gaub	dfe3e5b1cb	fix laser lifetimes	2015-10-20 09:30:27 -07:00
Seth Alves	41f7ef1e2e	cleanups	2015-10-19 16:53:27 -07:00
Seth Alves	6138775270	put back support for spatialKey	2015-10-19 15:40:14 -07:00
Seth Alves	5a968e3c96	tweak	2015-10-19 15:20:04 -07:00
Seth Alves	8fbf081223	git rid of sphere test	2015-10-19 14:51:18 -07:00
Seth Alves	c98685f6d3	in STATE_CONTINUE_FAR_GRABBING_NON_COLLIDING, when the ray moves off of the entity, switch back to search state	2015-10-16 11:39:27 -07:00
Seth Alves	066696e201	don't go into continue-far-grabbing-non-colliding mode.	2015-10-16 11:18:41 -07:00
Brad Hefta-Gaub	26f82e899e	Merge pull request #6079 from ericrius1/whiteboard ... Entity whitelist for raypicking and whiteboard painting example	2015-10-15 17:50:35 -07:00
Seth Alves	c884f466bc	adjust timing of action refresh	2015-10-15 10:40:58 -07:00
ericrius1	55c68e0509	Merge branch 'master' into whiteboard	2015-10-15 10:08:32 -07:00
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
Seth Alves	2a9b1c0fc3	fix refresh of hold action	2015-10-14 09:31:29 -07:00
Seth Alves	755b971906	tweak	2015-10-13 14:31:52 -07:00