164 commits

Author	SHA1	Message	Date
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Seth Alves	4246672813	enable head-moving of distance grabbing	2015-12-04 10:38:24 -08:00
Seth Alves	17b5ade9c0	allow moving distantly grabbed objects with head	2015-12-03 16:45:46 -08:00
Seth Alves	a600df5ea6	try a different method of exagerating hand motion onto distanly held object	2015-12-03 16:04:39 -08:00
Eric Levin	34234da2d1	fixed spacing	2015-12-01 17:05:51 -08:00
ericrius1	40fb45c6d3	fixed accidental newline in handgrab	2015-12-01 17:04:10 -08:00
ericrius1	0fd1bdaec5	fixed accidental newline in handgrab	2015-12-01 17:03:11 -08:00
ericrius1	e4199439af	added collision sounds to some toys	2015-12-01 17:00:43 -08:00
James B. Pollack	aca0fa7beb	support disabling both hands	2015-12-01 16:03:19 -08:00
Atlante45	c4e43c4e0b	Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball	2015-12-01 15:16:05 -08:00
Atlante45	97454ae446	Update handControllerGrab.js	2015-12-01 14:32:59 -08:00
Seth Alves	e0eae23dd3	Merge pull request #6515 from imgntn/personal_lasers ... Personal lasers in handControllerGrab.js	2015-12-01 13:29:05 -08:00
James B. Pollack	31d2f6463f	cleanup	2015-12-01 13:03:51 -08:00
James B. Pollack	25422084b9	make it so that only you can see your beams until youre grabbing something	2015-12-01 13:02:40 -08:00
Philip Rosedale	8e40889068	Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion ... possible fix for observers not seeing a held entity moving	2015-12-01 11:41:08 -08:00
Seth Alves	7f95e1eec6	make sure observed held objects are active in bullet, disable equip spring action	2015-12-01 10:49:07 -08:00
James B. Pollack	1ba6bfa2e0	lazers	2015-11-30 18:58:53 -08:00
ericrius1	b67c481726	resolved merge conflicts	2015-11-30 18:19:57 -08:00
James Pollack	55f797838f	remove unused key	2015-11-28 23:22:00 -08:00
James Pollack	1e2398cbea	use constants	2015-11-28 23:04:52 -08:00
James Pollack	1315201bdc	update name of function	2015-11-28 22:55:44 -08:00
James Pollack	8f51ee6f58	rename hand disabler	2015-11-28 22:29:12 -08:00
James B. Pollack	9ec2a01475	isolate grab script changes from bow branch	2015-11-27 12:13:53 -08:00
James B. Pollack	6f76f0cbc0	release grasp at cleanup	2015-11-19 16:22:54 -08:00
James B. Pollack	3f89d73fc6	add grasp to equip and example	2015-11-19 16:15:34 -08:00
ericrius1	4bf1c36fd6	Firing works	2015-11-18 14:32:49 -08:00
ericrius1	aed5629eca	equipping	2015-11-18 12:50:42 -08:00
ericrius1	47c2119888	Adding generic pistol	2015-11-18 12:25:36 -08:00
Seth Alves	94f18672d4	equip from a distance uses a spring to pull the object to the hand before equipping it	2015-11-17 17:18:16 -08:00
Seth Alves	5ae3c5aea0	adjust size of near-grab radius.	2015-11-17 14:59:06 -08:00
Seth Alves	c6051bb325	reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab	2015-11-17 14:58:20 -08:00
Seth Alves	d21a2fee20	don't use spatial-key for normal grab, only equip. allow switching from a near or far grab to an equip.	2015-11-17 13:12:22 -08:00
Seth Alves	b062d23f61	bumper is now an equip toggle	2015-11-17 09:51:52 -08:00
Seth Alves	8a434c8ab1	don't attempt to near-grab things that aren't physical	2015-11-09 14:10:26 -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
Seth Alves	4a3b434fd4	change grabbing-non-colliding to trigger. fix whiteboard and some other scripts	2015-11-05 10:35:02 -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
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