Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 06:20:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33722 commits 25 branches 0 tags 1.1 GiB
Commit graph

37 commits

Author SHA1 Message Date
Brad Davis
691e5f3be0 Remove new/old value division from endpoint::apply 2015-10-26 11:22:25 -07:00
Brad Davis
4e6f64833f Conditional support from JS 2015-10-23 17:24:04 -07:00
Brad Davis
0fdd32709f Moving conditionals and endpoints out of UserInputMapper 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-23 17:22:46 -07:00
Brad Hefta-Gaub
d5a90e273e fix AnyEndpoint support from JS 2015-10-23 15:56:55 -07:00
Brad Davis
54c20a8dd7 Taking a different tack on proper ordering of routes 2015-10-23 13:40:38 -07:00
Brad Davis
56deef9d6e Moving omniTool to a route mapped input 2015-10-23 13:40:36 -07:00
Brad Davis
e8be92cab8 Adding input action event 2015-10-23 13:36:06 -07:00
Brad Davis
91804fbc04 Fix ordering of standard vs device routes 2015-10-22 22:02:09 -07:00
Brad Davis
51c8d48c8c Fix broken conditional caused by invalid route ordering 2015-10-22 16:12:31 -07:00
Brad Davis
e40741b5cb Removing overrides / loopback support, adding route debugging 2015-10-22 15:52:10 -07:00
Brad Davis
6cf0bdcffe Testing function destination and fixing bug in rule ordering for multi-soure 2015-10-22 10:00:11 -07:00
Brad Davis
4938e5ea84 Fixing function based routes, makeAxis 2015-10-22 09:50:23 -07:00
Brad Davis
637654adea Wiring up step yaw 2015-10-21 18:46:09 -07:00
Brad Hefta-Gaub
60f9b3da85 Merge pull request #6141 from jherico/controllers 
Working on conditional and filter parsing
 2015-10-21 15:09:00 -07:00
Brad Davis
b9b03bd842 Working on conditional and filter parsing 2015-10-21 14:40:33 -07:00
Brad Hefta-Gaub
3eedfd369e expose the Pose structure to JS 2015-10-21 14:01:18 -07:00
samcake
feeb4b68a6 merging and fixing the POse transmission bug 2015-10-21 13:07:35 -07:00
Brad Davis
f0edc302bf Fixing filters creation 2015-10-20 22:06:08 -07:00
Brad Davis
a124d3b433 Moving to InputEndpoint, fixing build problem 2015-10-20 22:00:16 -07:00
Brad Davis
de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-20 21:59:00 -07:00
samcake
6f7719e9e9 Finally getting the merge to work 2015-10-20 17:44:24 -07:00
samcake
da55011c2a Trying to merge 2015-10-20 16:38:41 -07:00
Brad Davis
eacd6af032 Get conditional routes working 2015-10-20 16:32:00 -07:00
Brad Davis
22139931f2 Warning fixes 2015-10-20 10:48:23 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
samcake
8701d73ee9 DOing the groundwork to pass along the pose 
still not working
 2015-10-19 19:05:37 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Hefta-Gaub
251a55b1fb rename hardware controllers to not have device ID in the name 2015-10-17 12:52:37 -07:00
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
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
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
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Renamed from libraries/input-plugins/src/input-plugins/UserInputMapper.cpp (Browse further)