samcake
1fd37b51a2
trying to get somewhere....
2015-11-12 17:54:35 -08:00
Brad Davis
ee1545f649
Cleaning up clip and transform
2015-11-12 11:48:47 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
Atlante45
767a7a7f1e
Fix warnings on OS X
2015-11-09 14:26:23 -08:00
Atlante45
ffafd3194e
Recording audio fixes
2015-11-05 16:46:59 -08:00
Anthony Thibault
275b248547
Merge pull request #6302 from AndrewMeadows/fix-avatar-drift
...
fix slow drift of avatar when wearing HMD
2015-11-04 11:19:45 -08:00
samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
U-GAPOS\andrew
9de5721a48
set _hmdFollowVelocity to zero when done following
2015-11-04 10:23:55 -08:00
U-GAPOS\andrew
d544b7a645
fix bug: avatar can't walking when HMD at rest
2015-11-03 13:59:15 -08:00
Andrew Meadows
e160e2a7ae
the minimal fix
2015-11-03 11:37:30 -08:00
Andrew Meadows
12ff9734e0
init _bodySensorMatrix in ctor
2015-11-03 11:26:49 -08:00
U-GAPOS\andrew
a77f888f15
more correct HMD offset correction velocity
2015-11-02 11:29:17 -08:00
U-GAPOS\andrew
a545d770d8
fix bug preventing avatar motion in 2D mode
2015-11-02 11:07:43 -08:00
Andrew Meadows
9799693135
remove extra whitespace
2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
Seth Alves
ac1055c3e0
Merge pull request #6214 from howard-stearns/goToPosition
...
Don't go to wrong position on startup/teleport.
2015-10-29 10:15:26 -07:00
Seth Alves
10717dc364
Merge pull request #6154 from howard-stearns/safe-avatar-list-access
...
Safe avatar list access
2015-10-29 10:12:34 -07:00
howard-stearns
62e56d3f13
Don't go to wrong position on startup/teleport.
...
This fixes one cause of being in the wrong place.
https://app.asana.com/0/32622044445063/61787931469907
2015-10-28 16:44:53 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Howard Stearns
367175b8a6
Reduce lock time.
2015-10-28 10:49:19 -07:00
Brad Hefta-Gaub
19743c1f39
gak, build busters and more CR feedback
2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
eb19364129
CR feedback
2015-10-27 15:56:27 -07:00
Andrew Meadows
e35596428c
cleanup comment
2015-10-27 14:43:18 -07:00
Brad Hefta-Gaub
5a42991e0c
first pass at cleaning up MyAvatars use of PalmData
2015-10-27 13:51:42 -07:00
Andrew Meadows
8b285fd228
recover follow HMD behavior
2015-10-27 13:51:40 -07:00
Andrew Meadows
43aac813da
more prep for shifting avatar during HMD motion
2015-10-27 13:15:38 -07:00
Andrew Meadows
a1f1e50431
split CharacterController btw phys and interface
2015-10-27 13:15:38 -07:00
Howard Stearns
7b0b77f4d1
getAvatarHash => withAvatarHash
2015-10-23 16:57:27 -07:00
Brad Hefta-Gaub
f90844449d
fix angular velocity
2015-10-23 13:16:05 -07:00
Brad Hefta-Gaub
4a58eeb810
expose deltaRotation as part of MyAvatar.xxxHandPose
2015-10-23 12:14:33 -07:00
Brad Hefta-Gaub
71dfff7c35
first cut at adding MyAvatar.xxxHandPose
2015-10-23 12:00:40 -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 Hefta-Gaub
68a2985b7a
add tip position as well
2015-10-21 17:14:48 -07:00
Brad Hefta-Gaub
a3900a954b
expose MyAvatar.leftHandePosition and MyAvatar.rightHandPosition to JS
2015-10-21 17:03:54 -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
Thijs Wenker
8111432088
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-15 14:50:20 +02:00
Seth Alves
698a4001a8
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-14 06:18:02 -07:00
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -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
Brad Hefta-Gaub
8a2e23cae4
CR feedback
2015-10-13 16:20:52 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
Howard Stearns
93e908a592
Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized.
2015-10-13 12:15:13 -07:00
Seth Alves
7c52849740
change how hold action works
2015-10-13 11:36:58 -07:00
Howard Stearns
6cbeb6e7c3
Fix my bug, introduced in PR#6012, in which startup position goto got
...
cancelled out.
2015-10-12 15:40:16 -07:00
Thijs Wenker
7d3b300037
Fix set avatar rotations from scripts (different tread)
2015-10-11 14:51:12 +02:00
Anthony J. Thibault
0c489e3afd
MyAvatar: Rename new instance variable after merge.
2015-10-09 14:46:05 -07:00
