291 commits

Author	SHA1	Message	Date
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	bf4320e5cc	re-add this example	2015-11-06 22:55:33 -08:00
AlessandroSigna	715b183a3c	unified two ways to do the mapping in a single JS	2015-11-05 19:10:06 -08:00
AlessandroSigna	f9ebbea585	Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS	2015-11-05 19:09:49 -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
Brad Davis	86b852231e	Merge pull request #6286 from EdgarPironti/master ... Spacemouse migration	2015-11-04 19:15:35 -08:00
AlessandroSigna	eac73671e0	Added some documentation and examples for the new mapping system	2015-11-04 17:40:35 -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
EdgarPironti	ade0862948	Spacemouse fixes	2015-11-04 00:49:40 -08:00
EdgarPironti	1ab683643c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-04 00:36:38 -08:00
Brad Davis	439bdbc0e4	Merge pull request #6298 from samcake/controllers ... Controllers : Removing dead files	2015-11-03 19:57:37 -08:00
EdgarPironti	7adf38f781	Spacemouse migration	2015-11-03 18:22:55 -08:00
EdgarPironti	2a84cadd5d	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 18:22:29 -08:00
Atlante45	d8797ef9d7	Initialize relativePosition/Rotation	2015-11-03 16:07:37 -08:00
samcake	57bc2f3093	Removing dead js files	2015-11-03 15:37:36 -08:00
Stephen Birarda	8346ce27b3	allow a non-colliding grab of locked entities	2015-11-03 14:22:41 -08:00
EdgarPironti	d99838de9c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 12:25:19 -08:00
Seth Alves	27b239176f	fix grab	2015-11-03 10:16:56 -08:00
EdgarPironti	5d695da630	Do not merge - Spacemouse	2015-11-02 23:31:10 -08:00
James B. Pollack	192e4c8185	Merge pull request #6274 from ZappoMan/rightClickMenu ... add example of overriding default rightClick behavior	2015-11-02 18:58:12 -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	b94258f953	add example of overriding default rightClick behavior	2015-11-02 11:55:50 -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	f21633e368	Merge pull request #6222 from ZappoMan/hardwareChanged ... Handle input plugin register/remove when activated/deactivated by menus	2015-10-29 12:24:17 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD ... Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
Brad Hefta-Gaub	a3cd032a41	register/remove devices when the input plugins are activated/deactivated	2015-10-29 10:06:21 -07:00
samcake	b90af1a1ce	Fixing typo and review comments	2015-10-28 13:21:45 -07:00
samcake	07c13f4d66	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-28 12:54:46 -07:00
Brad Hefta-Gaub	30f7c44f61	emit hardwareChanged signal to scripts	2015-10-28 09:34:18 -07:00
samcake	6ec87086bc	Adding the state controller	2015-10-27 16:57:06 -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 Davis	b2c3311947	Merge pull request #6174 from samcake/controllers ... Controllers : Adding a moving average for the velocity field returned by the Hydra controller	2015-10-26 13:46:32 -07:00
Brad Hefta-Gaub	88ba6cda24	Merge pull request #6177 from jherico/guns ... Controller Branch - Fix gun.js	2015-10-26 10:51:08 -07:00
Brad Davis	75b2ee94b2	PR feedback	2015-10-25 19:37:41 -07:00
Brad Davis	3e50174114	Updating gun.js to new controller API	2015-10-24 16:26:50 -07:00