Seth Alves
c884f466bc
adjust timing of action refresh
2015-10-15 10:40:58 -07:00
Seth Alves
64c5cde2d2
further unmangle branch split
2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b
further unmangle branch split
2015-10-15 10:29:25 -07:00
Seth Alves
e571cb7ca4
more lock adjustments
2015-10-15 10:22:25 -07:00
Seth Alves
8195145dc7
further unmangle branch split
2015-10-15 10:13:00 -07:00
Seth Alves
d833fb08d7
further unmangle branch split
2015-10-15 10:03:32 -07:00
Seth Alves
c96f7562f2
Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes
2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613
remove line that leaked over from other branch
2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c
fix up AvatarActionHold
2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1
remove some debugging
2015-10-15 09:07:35 -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
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
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
Seth Alves
21519c6418
debugging
2015-10-14 14:13:08 -07:00
Seth Alves
5ce39b74fd
debugging
2015-10-14 13:58:19 -07:00
Seth Alves
9a2aa9a337
locking
2015-10-14 13:40:20 -07:00
Seth Alves
9937b6a3ef
quiet some debugging
2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87
more locking
2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f
more lock fixing
2015-10-14 12:49:06 -07:00
Seth Alves
fa2bf2b2d9
tighten up locking in actions
2015-10-14 11:43:03 -07:00
Seth Alves
9a9e5b962e
make edit logging terse vs not a domain-server setting
2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d
terse entity-edit logging
2015-10-14 09:31:44 -07:00
Seth Alves
2a9b1c0fc3
fix refresh of hold action
2015-10-14 09:31:29 -07:00
Seth Alves
698a4001a8
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511
rename a function
2015-10-14 06:17:55 -07:00
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -07:00
Seth Alves
f61a005ebc
cleanups
2015-10-13 17:47:41 -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
Seth Alves
74ced250c1
don't compress joint rotations
2015-10-13 17:18:28 -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
Seth Alves
644076214e
fix hang
2015-10-13 16:55:04 -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
Seth Alves
4402242c3c
allow an action to suppress sending of physics related edits to the entity-server
2015-10-13 16:27:40 -07:00
Brad Hefta-Gaub
8a2e23cae4
CR feedback
2015-10-13 16:20:52 -07:00
Seth Alves
2ecb7e8d29
fix bug that was making action deletes fail
2015-10-13 16:19:12 -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
