EdgarPironti
596b315286
Fixed standard.json
2015-10-27 11:35:30 -07:00
Brad Davis
ef2d71e576
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-10-27 09:41:58 -07:00
Philip Rosedale
bc07de3892
Merge pull request #6194 from howard-stearns/hydra-hack
...
Do not shut down hydra when it says there are no devices.
2015-10-26 22:04:49 -07:00
Brad Hefta-Gaub
c6f0410f4a
Merge pull request #6192 from AlessandroSigna/controllers
...
fix keyboard mapping (keyboardMouse.js)
2015-10-26 20:02:45 -07:00
howard-stearns
cbade6a095
Do not shut down hydra when it says there are no devices. Count to
...
allowedHydraFailures in settings.
2015-10-26 19:27:22 -07:00
AlessandroSigna
5bce95189b
fix keyboard mapping (keyboardMouse.js)
2015-10-26 18:14:57 -07:00
Howard Stearns
5e66207bc6
Merge pull request #6190 from hyperlogic/tony/owen-ik-fix
...
Bug fix for hand IK when using the Owen avatar.
2015-10-26 17:42:12 -07:00
Anthony J. Thibault
485e36d824
Bug fix for hand IK when using the Owen avatar.
...
The IK was assiming that the "Hips" bone index was always 0.
This was not the case for Owen. Now we lookup the Hips index
and cache it for use during the hipsOffset computation.
2015-10-26 17:17:46 -07:00
Brad Hefta-Gaub
55d0b8a99e
Merge pull request #6181 from jherico/capi
...
Remove new/old value division from endpoint::apply
2015-10-26 14:58:11 -07:00
Brad Hefta-Gaub
9c4199ef16
Merge pull request #6186 from jherico/pingpong
...
Fixing spray can script
2015-10-26 14:56:06 -07:00
Seth Alves
85a975b1f4
Merge pull request #6185 from Atlante45/cmake
...
Remove cmake debug code
2015-10-26 14:54:01 -07:00
Brad Davis
b2c3311947
Merge pull request #6174 from samcake/controllers
...
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
2015-10-26 13:46:32 -07:00
samcake
990764d855
Really fixing the MovingAverage class...
2015-10-26 13:29:13 -07:00
Brad Davis
d91d0a2027
Fixing spray can script
2015-10-26 12:47:31 -07:00
Brad Hefta-Gaub
aaaee30032
Merge pull request #6183 from jherico/pingpong
...
Fixing ping-ping entity script
2015-10-26 12:20:08 -07:00
Atlante45
9bead94fae
Remove cmake debug code
2015-10-26 12:07:12 -07:00
Brad Davis
34b5178393
Fixing ping-ping entity script
2015-10-26 11:55:23 -07:00
samcake
a8872d065b
MOve the movingAverage class to shared next to SimpleMovingAverage
2015-10-26 11:23:13 -07:00
Brad Davis
691e5f3be0
Remove new/old value division from endpoint::apply
2015-10-26 11:22:25 -07:00
Brad Hefta-Gaub
88ba6cda24
Merge pull request #6177 from jherico/guns
...
Controller Branch - Fix gun.js
2015-10-26 10:51:08 -07:00
Brad Hefta-Gaub
c2663d5f96
Merge pull request #6179 from jherico/vive
...
Adding Vive controller default mapping
2015-10-26 10:50:14 -07:00
Brad Davis
f38303a9a5
Adding vive default mapping
2015-10-26 10:36:31 -07:00
Brad Davis
75b2ee94b2
PR feedback
2015-10-25 19:37:41 -07:00
Brad Davis
a7547ef11e
Adding hysteresis filter, moving filters to individual files
2015-10-25 16:44:43 -07:00
Brad Davis
d1854cab53
Merge pull request #6176 from ZappoMan/fixScripts
...
fix frisbee.js to work with new API
2015-10-24 17:26:57 -07:00
Brad Davis
3e50174114
Updating gun.js to new controller API
2015-10-24 16:26:50 -07:00
Brad Davis
5bc736952a
Function based endpoints should inhibit spamming with repeats of the same value
2015-10-24 16:26:29 -07:00
Brad Hefta-Gaub
394511ac1b
fix frisbee.js to work with new API
2015-10-24 09:50:09 -07:00
Brad Davis
f61cf843bc
Merge pull request #6172 from ZappoMan/fixScripts
...
fix walkApi.js to detect hydra in official way
2015-10-23 21:04:17 -07:00
Brad Hefta-Gaub
6cffe8cb6a
Merge pull request #6169 from EdgarPironti/controllers2
...
fix toyball.js
2015-10-23 20:21:00 -07:00
Brad Hefta-Gaub
0b99728575
Merge pull request #6175 from AlessandroSigna/controllers
...
fix stick.js
2015-10-23 20:20:00 -07:00
Brad Hefta-Gaub
3a2328a887
Merge pull request #6173 from EdgarPironti/controllers
...
Fixed sword.js
2015-10-23 20:07:52 -07:00
AlessandroSigna
7f3f202567
fix stick.js
2015-10-23 18:23:15 -07:00
samcake
eae316100a
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-23 18:18:27 -07:00
samcake
d400c694f6
Cleaning up for release
2015-10-23 18:09:54 -07:00
EdgarPironti
0d15182adb
Fixed sword.js
2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub
4a19a14682
fix walkApi.js to detect hydra in official way
2015-10-23 17:53:34 -07:00
Brad Davis
304fe49628
Merge pull request #6170 from ZappoMan/fixScripts
...
various controller script updates
2015-10-23 17:43:54 -07:00
Brad Hefta-Gaub
2fba3c75e7
Merge pull request #6167 from jherico/c3
...
Conditional support from JS
2015-10-23 17:43:19 -07:00
Brad Hefta-Gaub
4817964739
Merge pull request #6166 from jherico/controllers
...
Moving conditionals and endpoints out of UserInputMapper
2015-10-23 17:40:54 -07:00
Brad Hefta-Gaub
060f87d14a
CR feedback
2015-10-23 17:33:45 -07:00
samcake
be843a0035
adding a rnning average on the velocity values returned by the hydra and adding a simple js to test
2015-10-23 17:32:54 -07:00
Brad Hefta-Gaub
9aaef9aabd
fix hydraPaint.js to use new API
2015-10-23 17:32:06 -07:00
EdgarPironti
0959c98132
Fixed tab
2015-10-23 17:26:44 -07:00
Brad Davis
4e6f64833f
Conditional support from JS
2015-10-23 17:24:04 -07:00
Brad Davis
d5425ac625
Moving conditionals and endpoints out of UserInputMapper
...
Conflicts:
libraries/controllers/src/controllers/UserInputMapper.cpp
2015-10-23 17:24:03 -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
9ba1b800d9
CR feedback
2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub
090dc5409b
CR feedback
2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub
ed20e7d209
CR feedback
2015-10-23 17:14:13 -07:00
