108 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	46e40ed032	work on device names	2015-10-14 18:52:19 -07:00
Brad Hefta-Gaub	4107f4ea9f	guard sixense from updating before activated	2015-10-14 15:32:10 -07:00
Brad Davis	0c31fb1b1b	Merge pull request #6069 from ZappoMan/controllers ... Hack in NewControllers into the JS layer of interface to allow testing	2015-10-13 19:08:26 -07:00
Brad Hefta-Gaub	7846965fbc	Merge pull request #6068 from jherico/controllers ... Making anonymous mappings work	2015-10-13 16:23:24 -07:00
Brad Davis	910629c287	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-13 13:32:05 -07:00
Brad Davis	261384b4bb	Fixing build breakage	2015-10-13 11:47:06 -07:00
Brad Davis	7f8f5f66c7	Working on plugin active concept	2015-10-13 10:01:01 -07:00
Ryan Huffman	9a9bdbbc44	hack in mappings to interface	2015-10-12 17:59:58 -07:00
Ryan Huffman	f860ca923e	revert small hack	2015-10-12 16:01:26 -07:00
Atlante45	c666c9fb9b	Fix warning	2015-10-12 13:40:33 -07:00
Ryan Huffman	ebeb87ba62	test	2015-10-12 11:21:40 -07:00
Brad Davis	f77878ee79	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-12 11:05:28 -07:00
Brad Davis	14f511350d	Working on refactoring the xbox hardware access and wiring up test code	2015-10-12 10:47:23 -07:00
Brad Hefta-Gaub	f8956a853b	Merge pull request #6051 from jherico/marge ... Cleanup CMake files	2015-10-11 16:22:56 -07:00
Brad Hefta-Gaub	21a473035e	more CR feedback	2015-10-11 15:37:17 -07:00
Brad Hefta-Gaub	312bbf6167	CR feedback	2015-10-11 15:15:20 -07:00
Brad Hefta-Gaub	9667a103aa	actually add new files	2015-10-11 15:02:11 -07:00
Brad Hefta-Gaub	0986f86c34	implement StandardController and expose it to JS as Controller.Standard.*	2015-10-11 14:55:07 -07:00
Brad Davis	6f5f6450df	Cleanup CMake files	2015-10-11 00:01:03 -07:00
Brad Hefta-Gaub	ded677e90f	Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface	2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub	63f3156a61	add Controler.Actions	2015-10-09 21:23:19 -07:00
Howard Stearns	7ba149fbbd	Log when hydra is disconnected.	2015-10-09 16:19:14 -07:00
Brad Hefta-Gaub	37f530f97f	first cut at wiring up devices and inputs to JS	2015-10-09 16:15:29 -07:00
Atlante45	cba8b0962d	Fix warnings	2015-10-09 13:29:59 -07:00
Andrew Meadows	0680be0422	save sixense settings and some UI cleanup	2015-10-07 14:19:15 -07:00
Clément Brisset	5eda3095bb	Merge pull request #5998 from birarda/qt-5.5 ... suppress warnings for overriden methods in Xcode 7	2015-10-05 17:00:43 -07:00
Stephen Birarda	3ddfcc10c2	override additions to input-plugins	2015-10-05 15:50:35 -07:00
Howard Stearns	844270e306	Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 12:44:22 -07:00
Andrew Meadows	e9c71f3867	cleanup comments	2015-10-02 10:02:12 -07:00
Andrew Meadows	940b8eb529	improve some variable names	2015-10-02 09:39:13 -07:00
Andrew Meadows	98fe06be57	cleanup sixense/hydra calibration	2015-10-02 09:30:18 -07:00
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub	9a0e5b9870	address Sam's concerns	2015-09-23 17:37:48 -07:00
ZappoMan	65a079cb53	fix mac build	2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub	ef25876c9a	implement vector caching for gpu::Batch	2015-09-23 14:46:47 -07:00
Shared Vive Room	3c64db5c86	Adjust controller offset from 6 inches to 3 inches ... When using the vive controller the position of your wrist should match your actual wrist a bit better, unless your name is Shaquille O'Neal.	2015-09-18 12:02:05 -07:00
Brad Davis	644e81e20b	Toggle mute while holding the hydras	2015-09-04 16:19:58 -07:00
Andrew Meadows	992bd5c9d2	fix sixense and vive rotation readings for palms	2015-09-02 11:37:36 -07:00
Stephen Birarda	9a4d666b0c	no consts if HAVE_SIXENSE not set	2015-09-01 15:33:54 -06:00
Stephen Birarda	2ce225d76c	fix for sixense not present on OS X	2015-09-01 15:33:46 -06:00
Seth Alves	3d7aa6f4d6	Merge pull request #5676 from AndrewMeadows/dubnium ... remove a few warnings from linux build	2015-09-01 11:45:06 -07:00
Andrew Meadows	617e210fc6	fix for vive controller to place hand for IK	2015-09-01 09:51:14 -07:00
Andrew Meadows	bb63267e30	fix hand IK rotations or all models	2015-09-01 09:45:14 -07:00
Andrew Meadows	614fad0811	remove warnings from linux build	2015-08-27 19:12:25 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Andrew Meadows	45c846572e	Merge pull request #5645 from jherico/maggie ... Fixing problems reported by static analysis tool	2015-08-26 08:31:05 -07:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Brad Davis	073567558e	Fix UserInputMapper event generation	2015-08-25 19:15:06 -07:00
Brad Hefta-Gaub	13a9dc4df2	cleanup controller interface, add getActionNames() and getDeviceNames()	2015-08-24 15:35:55 -07:00
Brad Hefta-Gaub	6549e47dbc	fix crash in Controller when asking for device name out of bounds	2015-08-24 14:35:19 -07:00