Brad Davis
a9aea9b477
Working on TestController display
2015-10-22 15:53:19 -07:00
Brad Davis
8c163a52e9
Attempting to fix log graphs
2015-10-22 15:49:58 -07:00
samcake
2ebf862da9
Merge pull request #6148 from jherico/controllerFunctions
...
Fixing controller functions & makeAxis
2015-10-22 11:56:58 -07:00
Brad Davis
7ed9ed8500
Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS
...
make handControllerGrab.js work with new API
2015-10-22 11:40:48 -07:00
Brad Hefta-Gaub
67f2a0c6c8
CR feedback on mappings
2015-10-22 11:39:51 -07:00
Brad Davis
5d4cbfdacb
Resolving ambiguity between functions and inputs differently
2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84
Fixing function based routes, makeAxis
2015-10-22 09:50:23 -07:00
Brad Hefta-Gaub
3e7364608b
make handControllerGrab.js work with new API
2015-10-22 09:17:29 -07:00
Brad Davis
afcec347ff
Wiring yaw action to avatar
2015-10-21 21:35:19 -07:00
Brad Davis
044a28212d
Wiring step yaw to the avatar
2015-10-21 20:44:38 -07:00
Brad Davis
637654adea
Wiring up step yaw
2015-10-21 18:46:09 -07:00
Brad Davis
4a1df286fd
Cleanup of enums and JS names
2015-10-21 15:57:37 -07:00
Brad Davis
b9b03bd842
Working on conditional and filter parsing
2015-10-21 14:40:33 -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
da26d0dee1
Adding the hand poses channels in the controller mapping files
2015-10-20 18:19:44 -07:00
Brad Davis
cd940325c2
Merge remote-tracking branch 'upstream/controllers' into controllers
2015-10-20 17:48:29 -07:00
Brad Davis
0e419e3fbb
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 17:47:37 -07:00
Brad Davis
eacd6af032
Get conditional routes working
2015-10-20 16:32:00 -07:00
Andrew Meadows
d02fe784a9
css and cfg filetypes are text in .gitattributes
2015-10-20 13:58:44 -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
Brad Davis
ef6c4f6f66
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:15:36 -07:00
Brad Hefta-Gaub
56f625d376
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-19 16:53:25 -07:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -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 Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
samcake
f675035fd1
Merge pull request #6101 from jherico/controllers
...
Hydra controller updates and test code
2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed
Update hydra mappings and test code
2015-10-16 17:23:09 -07:00
Brad Davis
4f8e2c9f6b
Fix JSON format errors
2015-10-15 13:18:04 -07:00
Thijs Wenker
9d2ae661e1
removed some XML from start-script button which possible caused an error before
2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10
ScriptEditor Improvements:
...
- fixed run icon
2015-10-14 21:00:50 +02:00
Brad Davis
910629c287
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-13 13:32:05 -07:00
Andrew Meadows
22786dea7d
cleanup
2015-10-12 13:35:26 -07:00
U-GAPOS\andrew
f01847de14
experimental HMD hips tracking
2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258
initial hip translation from IK
...
works for 2D 3rd person but probably not well for HMD
2015-10-12 11:39:54 -07:00
samcake
297c3c9ed0
Fixing json issues
2015-10-09 17:37:51 -07:00
samcake
c02d33c17c
Adding example mapping files
2015-10-09 17:27:50 -07:00
Anthony J. Thibault
0cebeb7fe9
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
...
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub
521aaa0998
Merge pull request #5974 from Atlante45/extra_debug
...
Remove extra debug
2015-10-01 14:42:45 -07:00
Atlante45
b37bf2b1b6
Remove extra debug
2015-10-01 13:18:22 -07:00
Andrew Meadows
b192d0a9cd
make neck IK target type same as head
2015-09-29 17:39:17 -07:00
Anthony J. Thibault
fc9b270951
Merge branch 'master' into tony/gangsta-lean
2015-09-25 11:36:58 -07:00
Anthony J. Thibault
20d784ba39
Threshold based walking while in HMD.
...
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.
While this occurs the avatar should play the appropriate walking animations.
2015-09-24 17:54:32 -07:00
Andrew Meadows
17e3e9394f
allow head translation for 3rd person screenie IK
2015-09-24 12:38:46 -07:00
Anthony J. Thibault
a454584496
Updated default avatar-animation.json
2015-09-23 10:59:52 -07:00
Andrew Meadows
7060befd1c
Merge pull request #5862 from howard-stearns/user-specified-animation-graph
...
user-specified animation graph
2015-09-22 10:48:28 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
