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
80cffdb764
Merge pull request #6082 from ZappoMan/renameInputPlugins
...
Controllers branch - Rename input plugins
2015-10-15 12:29:35 -07:00
Brad Davis
80c962a4cc
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-15 12:27:53 -07:00
Stephen Birarda
b6a2cc396c
Merge pull request #6089 from ZappoMan/fixStat
...
fix Queue OUT stat
2015-10-15 11:53:34 -07:00
Brad Hefta-Gaub
b7c40c2df1
fix Queue OUT stat
2015-10-15 11:41:04 -07:00
samcake
cdfe9788d1
Merging
2015-10-15 10:49:08 -07:00
Andrew Meadows
2ae62de84e
Merge pull request #6026 from birarda/qt-polling-env
...
set bearer poll timeout env for wlan scan in Qt 5.5
2015-10-15 09:58:32 -07:00
Howard Stearns
2b32b23299
Merge pull request #6052 from thoys/JS_Rotation_FIX
...
Fix avatar joint rotations / translations to be set by script
2015-10-15 07:09:02 -07:00
Thijs Wenker
c99573ea64
Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now!
2015-10-15 15:35:35 +02:00
Thijs Wenker
8111432088
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-15 14:50:20 +02: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 Hefta-Gaub
46e40ed032
work on device names
2015-10-14 18:52:19 -07:00
Brad Hefta-Gaub
dc0f1378b7
Merge pull request #6080 from jherico/controllers
...
Controllers Branch - Merging the old and new interfaces
2015-10-14 18:48:38 -07:00
samcake
12e103c90c
Get json creating the mappings from js
2015-10-14 17:41:39 -07:00
Brad Davis
195045a4ec
Next time remember to hit build all before commiting
2015-10-14 17:20:30 -07:00
Brad Davis
10df0f2d8c
Fix broken assignment-client build
2015-10-14 17:07:10 -07:00
Clément Brisset
efd106e68c
Merge pull request #6075 from birarda/default-asset-server
...
add a migrator to move assets to ATP
2015-10-14 17:02:10 -07:00
Brad Davis
e39219c2b5
Fixes and PR comments
2015-10-14 16:51:52 -07:00
Brad Hefta-Gaub
4107f4ea9f
guard sixense from updating before activated
2015-10-14 15:32:10 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
Andrew Meadows
982476d02b
Merge pull request #6076 from hyperlogic/tony/turn-hips-while-moving
...
Rotate the avatar to align with the HMD while moving
2015-10-14 15:09:39 -07:00
samcake
4554d65230
Merge pull request #6077 from ZappoMan/monoOculusPreview
...
basic mono preview for the oculus display plugin
2015-10-14 15:07:46 -07:00
Anthony J. Thibault
3e7a6fd490
Change to boom offset for 3rd person HMD camera.
...
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.
Now it is computed in world space, and is always behind the character's
position/orientation. This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
2015-10-14 14:43:59 -07:00
Brad Davis
619fce0d7f
Fixing namespace usage in input-plugins
2015-10-14 13:40:22 -07:00
Brad Davis
f051a84dc6
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-14 10:54:32 -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
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
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -07:00
Brad Hefta-Gaub
c4af4c7b10
basic mono preview for the oculus display plugin
2015-10-13 17:45:29 -07:00
Anthony J. Thibault
e484a904a2
Rotate the avatar to align with the HMD while moving
...
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.
* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.
New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.
Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms. This hysteresis should help smooth over two issues.
1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
2015-10-13 17:36:00 -07:00
Andrew Meadows
073b019458
Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup
...
Don't reload/recenter some avatar data on startup
2015-10-13 17:08:00 -07:00
Stephen Birarda
d84994d8e0
fix casing for ubuntu include failure
2015-10-13 17:04:45 -07:00
Stephen Birarda
2caa7f6d64
change getUrl to getATPUrl, use in ATPAssetMigrator
2015-10-13 16:56:20 -07:00
Stephen Birarda
574089530a
make sure request is not nullptr before using it
2015-10-13 16:49:12 -07:00
Andrew Meadows
a331edcee9
Merge pull request #6073 from ZappoMan/comfortModeHack
...
implement comfort mode hack
2015-10-13 16:47:45 -07:00
Stephen Birarda
d22c602041
use categorized logging in ATPAssetMigrator
2015-10-13 16:44:13 -07:00
Stephen Birarda
cc93767077
remove some extra spaces
2015-10-13 16:38:00 -07:00
Stephen Birarda
76bfc6218a
add back block removed in merge
2015-10-13 16:36:10 -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 Hefta-Gaub
8a2e23cae4
CR feedback
2015-10-13 16:20:52 -07:00
Stephen Birarda
1450305390
fix ATP url scheme constant
2015-10-13 16:13:47 -07:00
Stephen Birarda
fc82ea8541
resolve conflicts on merge with upstream/master
2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d
Merge pull request #6074 from huffman/fix-empty-hash
...
Fix crash when atp url is empty
2015-10-13 16:02:28 -07:00
Stephen Birarda
549043f255
add an option to bulk upload assets in ATPAssetMigrator
2015-10-13 15:20:37 -07:00
Ryan Huffman
c468cabe7e
Fix crash when atp url is empty
2015-10-13 15:12:01 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
James B. Pollack
5f36972cfc
Merge pull request #6071 from imgntn/invert_solids
...
[Scripts] Toybox Updates
2015-10-13 13:48:31 -07:00
