694 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	3dcdfbc0f1	first cut at simulating mouse/reticle behavior with input contorllers	2015-12-15 13:59:22 -08:00
Brad Hefta-Gaub	2815cb0fef	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
Brad Davis	b9ace94ff1	Prototyping threaded present	2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub	c0bd54e8a2	change hydra secondary thumb to 0 button	2015-12-03 09:06:18 -08:00
Brad Hefta-Gaub	b122586ea5	remove camera cycle and context menu from standard mapping	2015-12-03 08:08:04 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Howard Stearns	f6286201f4	cleanup	2015-11-19 11:55:22 -08:00
Anthony J. Thibault	b481d7c73d	Merge branch 'master' into tony/remove-joint-states	2015-11-18 09:38:21 -08:00
Howard Stearns	fee13d4375	Rebuild on a new branch after original stopped building.	2015-11-17 20:06:25 -08:00
Anthony J. Thibault	80eb247b9c	WIP checkin ... * AnimManipulator: added absolute and relative position and translation support * Rig: added _overrideFlags and _overridePoses for script overrides.	2015-11-16 18:49:47 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
Anthony J. Thibault	55adedcec8	Merge branch 'master' into tony/remove-joint-states	2015-11-16 11:22:44 -08:00
Seth Alves	715a46ee82	show actions in status icons	2015-11-11 16:35:04 -08:00
Anthony J. Thibault	56e96ed24c	Merge branch 'master' into tony/script-start-stop-anim	2015-11-11 11:33:24 -08:00
Seth Alves	b38c1cb30f	add icons	2015-11-11 08:01:21 -08:00
Anthony J. Thibault	a0f21228f6	AnimGraph support for start and stop animation from JavaScript ... Follows the same model as the existing startAnimation and stopAnimation calls. See kneel.js for an example.	2015-11-09 12:19:01 -08:00
samcake	b1d5a36dc6	removing useless differences	2015-11-06 16:40:46 -08:00
samcake	bc852d8eab	removing useless differences	2015-11-06 16:39:23 -08:00
samcake	5fb2c3ccd1	resolve merge conflict	2015-11-06 16:27:47 -08:00
AlessandroSigna	6d3a79af83	changed the behaviour of Standard.LY input	2015-11-06 12:46:08 -08:00
samcake	2f9c33dbfb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 09:35:48 -08:00
Howard Stearns	aef8b7639d	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-05 11:58:08 -08:00
samcake	bc5e0b7b96	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-05 09:57:11 -08:00
samcake	00797b4dea	Merge pull request #6314 from jherico/homer ... Fixing step yaw to move by consistent amounts, be 'tappable'	2015-11-04 23:33:45 -08:00
Brad Davis	86b852231e	Merge pull request #6286 from EdgarPironti/master ... Spacemouse migration	2015-11-04 19:15:35 -08:00
samcake	f4c610a0f4	Tuning the standard mapping for tbringin vertical axis	2015-11-04 18:21:04 -08:00
Brad Davis	20d1035821	Fixing step yaw to move by consistent amounts, be 'tappable'	2015-11-04 15:54:50 -08:00
samcake	d4259931b2	Setting the step yaw to 22.5 degrees	2015-11-04 10:57:39 -08:00
samcake	ce5e89ce66	removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file	2015-11-04 10:53:53 -08:00
Howard Stearns	7b9245022c	Merge branch 'away' of https://github.com/howard-stearns/hifi into away	2015-11-04 10:46:16 -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
EdgarPironti	7adf38f781	Spacemouse migration	2015-11-03 18:22:55 -08:00
Howard Stearns	4a54f2052e	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-03 17:42:38 -08:00
samcake	4d62c532f5	Removing dead config files	2015-11-03 15:35:13 -08:00
howard-stearns	a7162eefbe	Add alphaVar for ik.	2015-11-03 13:10:25 -08:00
EdgarPironti	d99838de9c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 12:25:19 -08:00
samcake	78e3f8ebbc	Merge pull request #6281 from AlessandroSigna/master ... Vive - fix input drifting	2015-11-03 10:19:59 -08:00
EdgarPironti	5d695da630	Do not merge - Spacemouse	2015-11-02 23:31:10 -08:00
Howard Stearns	b74ed36883	Fix outro start times, and introduce away states (which are not used in C++ code, but are used in script).	2015-11-02 20:39:31 -08:00
AlessandroSigna	b77945d430	Vive - fix input drifting ... Conflicts: libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp	2015-11-02 16:06:17 -08:00
Brad Hefta-Gaub	d359aa3b65	more tweaks	2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub	46bedf7667	more tweaks to hydra mappings	2015-11-02 13:35:49 -08:00
Anthony J. Thibault	2236573a9d	Merge branch 'master' into tony/anim-sync-blend	2015-11-02 12:18:11 -08:00
Brad Hefta-Gaub	b00f572e1a	add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag	2015-11-02 09:21:15 -08:00
Anthony J. Thibault	e3e759248f	Merge branch 'master' into tony/anim-sync-blend	2015-11-02 08:37:10 -08:00
Brad Hefta-Gaub	70b9aa5ff1	remove right click context menu until we can make it work with camera move better	2015-11-02 07:42:52 -08:00
Brad Hefta-Gaub	e899229cde	tweaks to how VrMenu is shown	2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub	77816d818a	make RY map to jump	2015-10-31 16:00:22 -07:00
Brad Hefta-Gaub	05dea847be	add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu	2015-10-31 15:47:40 -07:00