328 commits

Author	SHA1	Message	Date
James B. Pollack	70a0e51cc9	back to default state	2015-12-11 17:59:03 -08:00
James B. Pollack	1b1edf6f7a	actually delete lights now that it doesnt crash	2015-12-11 17:23:35 -08:00
James B. Pollack	11aaeb1ec0	only create particle beams if set	2015-12-11 14:48:07 -08:00
James B. Pollack	4e9d81f187	add support for various beam visualizations	2015-12-11 11:38:16 -08:00
James B. Pollack	2acc0df1f0	beams with spotlights	2015-12-10 17:39:29 -08:00
James B. Pollack	16ab7e74de	cleanup spotlights	2015-12-10 16:53:13 -08:00
James B. Pollack	efaa30a509	rotatable light	2015-12-10 16:18:40 -08:00
James B. Pollack	9fc456697e	merge	2015-12-10 14:30:55 -08:00
James B. Pollack	c3e9cde7fb	beamz	2015-12-10 13:44:53 -08:00
James B. Pollack	1000b60280	far beams	2015-12-10 12:21:50 -08:00
James B. Pollack	31526091d3	create beams at start	2015-12-10 11:13:35 -08:00
James B. Pollack	1134d12ea0	particles	2015-12-09 16:08:32 -08:00
Atlante45	65bc6aa371	Fix left hand grab	2015-12-09 14:25:18 -08:00
James B. Pollack	2fb318cc53	work with clements branch	2015-12-08 17:52:23 -08:00
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
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
ericrius1	04f0d792bb	Reverted grab back to 5 hz	2015-10-12 17:36:53 -07:00
ericrius1	33ff21f376	Got rid of debug message in handControllerGrab script	2015-10-12 17:36:07 -07:00
ericrius1	f93b1d3325	Correctly whitelisting entities for ray picking	2015-10-12 17:05:34 -07:00
Seth Alves	f0ce698d78	switch back to springy grab	2015-10-12 16:57:20 -07:00
ericrius1	d01dda9c81	Adding in functionality to include only specified Ids in ray picking	2015-10-12 14:40:11 -07:00
Seth Alves	5c95306e8e	merge from upstream	2015-10-10 09:34:13 -07:00
Seth Alves	7824d03e11	grab script picks 5x per second rather than 60x	2015-10-09 17:56:32 -07:00
Seth Alves	c6c44e8b81	add a userdata flag that allows toggling of the ignoreForCollisions entity property when an item is held.	2015-10-09 15:42:30 -07:00
ericrius1	aac372cc8a	Fixed styling errors	2015-10-08 09:53:06 -07:00
ericrius1	efc2dfb68f	Added grab far events for non physical objects	2015-10-07 18:06:37 -07:00
Seth Alves	7f8411d947	reference count grabs on an entity	2015-10-05 14:15:38 -07:00
Seth Alves	635c83dad1	reset gravity and ignore-for-collisions after grabs have released	2015-10-05 13:39:01 -07:00
Seth Alves	7f84e882c5	attempt to keep ignoreForCollisions the same before and after grab	2015-10-05 13:06:39 -07:00
Seth Alves	8f924f0be4	merge from upstream	2015-10-05 13:05:37 -07:00
Seth Alves	26310d8ce4	kill gravity in near-held objects	2015-10-02 17:54:09 -07:00
Seth Alves	89c848d8c8	fix up kinematic hold	2015-10-02 17:14:53 -07:00
Seth Alves	c0e8b02a2f	fix what happens when a distance grab is blocked because someone else already has it	2015-10-02 12:25:34 -07:00
Seth Alves	5b970e6b1a	try to fix double-distance-grabbing lockout	2015-10-02 11:43:19 -07:00
Seth Alves	2700529b33	lower action lifetime	2015-10-01 10:41:43 -07:00
Seth Alves	d4f954a0e2	allow more than one near-grab on an object	2015-10-01 10:25:30 -07:00
Seth Alves	cd2a1542e0	increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something	2015-09-30 16:05:16 -07:00
Seth Alves	4e057e5ada	increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something	2015-09-30 16:03:54 -07:00
Seth Alves	dd0a16df04	don't leave search state if we intersect something that someone else is already grabbing	2015-09-30 14:19:59 -07:00
Seth Alves	b417abc3de	try again on string startswith	2015-09-30 14:16:07 -07:00
Seth Alves	f746a970de	don't grab something if someone else is already grabbing it	2015-09-30 14:03:10 -07:00
Seth Alves	7c6846c260	add lifetime and tag arguments to actions	2015-09-30 13:09:41 -07:00
Seth Alves	472ff89f48	rearrange when avatar collisions are adjusted	2015-09-29 15:52:38 -07:00
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)