Commit graph

809 commits

Author SHA1 Message Date
amantley
7cc724a27b added properties to allow the toggling of the debug draw the look at vector, and the reset moving average look at on step detection 2018-07-18 17:08:04 -07:00
amantley
ef2d3c9f16 Merge remote-tracking branch 'upstream/master' into rotateFilterChange
synching with master
2018-07-18 09:00:18 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler
Allow creators to disable hand touch from javascript
2018-07-18 08:16:37 -06:00
amantley
33f9acde67 latest 2018-07-17 17:42:11 -07:00
luiscuenca
e3594fe1b7 mutex added 2018-07-17 17:23:03 -07:00
luiscuenca
ba884f8a94 Forgotten coment 2018-07-17 16:42:59 -07:00
luiscuenca
6225435385 some ortographic fixes 2018-07-17 16:38:34 -07:00
luiscuenca
fcb7614f7e Format and fixes 2018-07-17 16:34:30 -07:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
amantley
abb2c7ef14 Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter. 2018-07-16 11:29:49 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping
Step Detection From Head and Hands Tracking
2018-07-10 09:59:22 -07:00
amantley
cb421fd5b0 fixed build errors for mac and linux 2018-07-09 15:09:45 -07:00
amantley
a3417cace9 implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight 2018-07-09 11:58:02 -07:00
amantley
defd6f88e6 started changes suggested by code review, ie mode computation 2018-07-06 18:17:13 -07:00
Alexander Ivash
7fa09aef8f slightly update jsdoc with functions description 2018-07-06 21:00:55 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
amantley
0ebc7fc29e fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency 2018-07-05 13:41:06 -07:00
amantley
9e5763ea5c adding the recentering back into the non hmd lean code 2018-07-03 11:46:59 -07:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
amantley
44d9edec3c added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning 2018-06-29 14:42:23 -07:00
amantley
15a17ae32a finished the step detection, need to finish the failsafe 2018-06-28 18:36:13 -07:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster
The client should render "something" for an avatar even if mesh or identity is not available
2018-06-28 12:12:16 -07:00
amantley
3e6d54e83c added all the parts for the step conditional to do: failsafe 2018-06-28 11:56:46 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay
Implement MS16257: Remove 'clear overlay when moving' setting and code
2018-06-28 09:31:04 -07:00
amantley
621ca7d2b4 more work on the mode function 2018-06-27 18:46:24 -07:00
amantley
61a935dbb5 added the first pass at mode computation 2018-06-27 18:02:11 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default
Disable flying by default
2018-06-27 16:04:16 -07:00
amantley
205cd44a49 removed override keyword from OtherAvatar and MyAvatar destructors, also
added the virtual keyword to the createOrb virtual method in OtherAvatar
2018-06-27 14:31:39 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
Dante Ruiz
1fec900ba6 disable flying by default 2018-06-26 13:31:59 -07:00
David Rowe
be4b929301 Fix cauterization when reparent entity to a different joint 2018-06-16 16:31:06 +12:00
David Rowe
249f72758e Fix entity detaching from head joint not becoming visible 2018-06-15 16:36:16 +12:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
2018-06-13 10:32:59 -07:00
Anthony J. Thibault
042f902d2e Merge branch 'master' into scriptedBlendshapesFaceFlags 2018-06-11 17:13:30 -07:00
Anthony J. Thibault
f773aef053 Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68 2018-06-11 11:06:21 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
2018-06-08 17:53:55 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
2018-06-07 16:20:11 -07:00
Anthony J. Thibault
608575cf17 Large avatars should instantly shrink when entering small height domains
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
2018-06-07 15:31:40 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
David Rowe
b5028a9626 Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
2018-06-05 09:13:54 +12:00
Anthony J. Thibault
c3d1daf855 Merge branch 'master' into nativeCGCode 2018-06-04 09:32:38 -07:00
amantley
3bda5bf6a0 added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h 2018-05-31 17:58:37 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
amantley
7cc5e96f2d Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes
merging hifi master to update the branch
2018-05-31 10:35:31 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
David Rowe
0db440931e Miscellaneous JSDoc fixes 2018-05-30 10:02:30 +12:00