279 commits

Author	SHA1	Message	Date
samcake	0fc04ab297	Fixing the review comments and setting the StandardDevice of USerINputMapper in the registeredDevices just like any other, only the ID is special	2015-10-16 14:45:38 -07:00
samcake	f0034844e7	Actions working from the Controller layer	2015-10-16 12:24:12 -07:00
samcake	43d7fe491e	wiring the actions	2015-10-15 17:53:53 -07:00
samcake	d44beca29f	Merge pull request #6092 from jherico/controllers ... Controllers Branch - Fix hardware access from JS...	2015-10-15 15:41:36 -07:00
samcake	63ad9ae198	Fixing the include file names...	2015-10-15 15:02:55 -07:00
samcake	1b03b6867c	Fixing the include file names...	2015-10-15 15:01:34 -07:00
samcake	249efa383e	MErging maybe finally ??????	2015-10-15 14:49:22 -07:00
samcake	2ad6c2067b	MErging maybe finally ??????	2015-10-15 14:43:15 -07:00
samcake	416df1c44c	Fixing the mac build	2015-10-15 14:21:08 -07:00
Brad Davis	eff8c28a28	Fixing access to hardware devices	2015-10-15 14:04:55 -07:00
samcake	cdfe9788d1	Merging	2015-10-15 10:49:08 -07:00
Brad Hefta-Gaub	52021f573d	Merge branch 'controllers' of https://github.com/highfidelity/hifi into renameInputPlugins ... Conflicts: libraries/controllers/src/controllers/UserInputMapper.cpp	2015-10-14 19:05:41 -07:00
samcake	12e103c90c	Get json creating the mappings from js	2015-10-14 17:41:39 -07:00
Brad Davis	e39219c2b5	Fixes and PR comments	2015-10-14 16:51:52 -07:00
Brad Davis	0063f9ae1d	Merging old and new controller interfaces	2015-10-14 15:16:54 -07:00
samcake	1302b6a238	Improving the Factory registration	2015-10-14 10:47:49 -07:00
samcake	3d5bf9aa1a	merging with current upstrem	2015-10-14 09:41:11 -07:00
samcake	cb62527bf9	Refactoring the filter for supporting the factory	2015-10-14 09:22:30 -07:00
Brad Davis	3ca3c635c0	Support functions in QScript contexts	2015-10-12 18:40:47 -07:00
samcake	dc32d5ae8d	Current status of my code for json	2015-10-12 18:03:21 -07:00
Brad Davis	58d3578fb1	Making anonymous mappings work	2015-10-12 17:59:01 -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 Davis	14f33258ae	Working on test code, new controller interface	2015-10-10 16:08:44 -07:00
Brad Davis	9e4a7a6226	Working on controller refactoring	2015-10-10 03:05:42 -07:00
Brad Davis	c2da6600f5	Fixing includes	2015-10-09 17:49:24 -07:00
Brad Davis	78624679ed	Adding more parsing functions	2015-10-09 17:30:46 -07:00
Brad Davis	c3775623aa	Splitting files, adding test skeleton	2015-10-09 17:23:52 -07:00
Brad Davis	184e9a2209	Prototyping controllers	2015-10-09 16:20:55 -07:00
Brad Davis	1dfafec5af	Prototyping controller refactoring	2015-10-09 15:51:02 -07:00