Sam Gondelman
|
2edefe3209
|
Merge branch 'master' into destroy
|
2018-08-06 09:51:14 -07:00 |
|
amantley
|
08889b627a
|
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
|
2018-08-06 09:16:53 -07:00 |
|
Dante Ruiz
|
f30b552e19
|
fix-flying
|
2018-08-03 15:50:11 -07:00 |
|
amantley
|
bd88d5f15b
|
merging with ik leg fix code in master
|
2018-08-02 09:48:04 -07:00 |
|
amantley
|
6b2c67e5bd
|
more doug support
|
2018-08-01 18:22:51 -07:00 |
|
SamGondelman
|
8a9c27ed92
|
Merge remote-tracking branch 'upstream/master' into destroy
|
2018-08-01 16:07:48 -07:00 |
|
amantley
|
02dd2f4f28
|
added velocity scaling for forward and back
|
2018-07-31 18:26:44 -07:00 |
|
John Conklin II
|
16940cc9b7
|
Merge pull request #13716 from r3tk0n/17170-flying-crash
Remove deprecated flying setting from MyAvatar.cpp saveData()
|
2018-07-31 09:48:01 -07:00 |
|
John Conklin II
|
bd2ab38bfe
|
Merge pull request #13701 from ElderOrb/FB16702
FB16702 - Avatar App does not save Animation JSON Override URL
|
2018-07-30 14:51:32 -07:00 |
|
r3tk0n
|
63de16bac5
|
Remove deprecated flying setting from MyAvatar.cpp saveData()
|
2018-07-30 11:40:15 -07:00 |
|
John Conklin II
|
021e09d083
|
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 12:49:14 -07:00 |
|
John Conklin II
|
d4cbbfe4c1
|
Merge pull request #13692 from amantley/leanBackSittingFix
Fix For Unnatural Hips Behaviour When Sitting In HMD
|
2018-07-27 12:30:31 -07:00 |
|
Seth Alves
|
91d509f5a4
|
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 10:35:26 -07:00 |
|
Alexander Ivash
|
29f7cab7df
|
FB16702 - Avatar App does not save Animation JSON Override URL
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
|
2018-07-27 02:08:44 +03:00 |
|
r3tk0n
|
f3d0d9b4a0
|
Clean up garbage comments.
|
2018-07-26 15:37:42 -07:00 |
|
r3tk0n
|
f8c611b1d0
|
Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp
|
2018-07-26 15:35:12 -07:00 |
|
amantley
|
12cb212dc7
|
used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards
|
2018-07-26 12:05:17 -07:00 |
|
amantley
|
37540c79b3
|
removed print statement and added const upper leg fraction
|
2018-07-25 10:51:19 -07:00 |
|
amantley
|
c5599623f7
|
added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting
|
2018-07-25 10:29:29 -07:00 |
|
John Conklin II
|
2ac9463830
|
Merge pull request #13653 from ElderOrb/fake-wearables-fix
FB16870: Avatar Wearables showing incorrect number
|
2018-07-23 15:55:11 -07:00 |
|
Alexander Ivash
|
33c858774b
|
fix coding standard compliance
|
2018-07-23 21:01:43 +03:00 |
|
r3tk0n
|
bc91affa70
|
Bring this PR inline with RC70.1 PR.
|
2018-07-20 15:13:44 -07:00 |
|
Alexander Ivash
|
849c91d8f6
|
remove not necessary EntityTreeRenderer from removeAvatarEntities's condition
|
2018-07-20 19:32:58 +03:00 |
|
Alexander Ivash
|
fb8640de47
|
FB16870: Avatar Wearables showing incorrect number
|
2018-07-20 02:51:17 +03:00 |
|
MuteTab
|
dfcf47e8ee
|
Removed useless comment.
|
2018-07-19 14:44:32 -07:00 |
|
MuteTab
|
8d65e14193
|
Remove one change, turned out to be unnecessary.
|
2018-07-19 14:43:46 -07:00 |
|
MuteTab
|
3080539b63
|
Make getFlyingEnabled() always true when in desktop.
|
2018-07-19 14:40:20 -07:00 |
|
amantley
|
5ec7ab3a7d
|
removed the other way of computing the average lookat which used a ring buffer
|
2018-07-18 17:20:47 -07:00 |
|
amantley
|
a8c4f4e650
|
removed extra whitespace
|
2018-07-18 17:10:09 -07:00 |
|
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
|
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 |
|
John Conklin II
|
81f5631ce9
|
Merge pull request #13386 from ElderOrb/FB13949
AvatarApp
|
2018-07-09 15:20:18 -07:00 |
|
amantley
|
cb421fd5b0
|
fixed build errors for mac and linux
|
2018-07-09 15:09:45 -07:00 |
|
amantley
|
55ae08c071
|
Merge remote-tracking branch 'upstream/master' into integratedStepping
|
2018-07-09 13:55:59 -07:00 |
|
amantley
|
b2d77ef51a
|
bracket spacing
|
2018-07-09 13:54:18 -07:00 |
|
amantley
|
7ed8f17b57
|
tweaked posterior threshold and head velocity threshold
|
2018-07-09 13:49:21 -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
|
aaa2e3f6a8
|
fix issue with duplicated wearables on switching between bookmarks / cancelling 'adjust wearables'
|
2018-07-06 21:00:56 +03:00 |
|
Alexander Ivash
|
dbcc654af1
|
remove comments
|
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
|
b6769f9678
|
avatar selection & wearables adjustments work-on-progress
|
2018-07-06 21:00:52 +03:00 |
|
Dante Ruiz
|
533164e1e4
|
some more fixes
|
2018-07-06 08:55:20 -07:00 |
|
SamGondelman
|
7954865141
|
trying to fix dependency shutdown
|
2018-07-05 14:34:37 -07: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
|
6460c9e861
|
fixed case for 0.0 as the filter length
|
2018-07-03 17:11:19 -07:00 |
|
amantley
|
4995b57712
|
removed print statements and fixed rotation threshold update code
|
2018-07-03 14:31:36 -07:00 |
|
amantley
|
59dfe80940
|
Merge remote-tracking branch 'upstream/master' into integratedStepping
|
2018-07-03 11:47:09 -07:00 |
|
amantley
|
9e5763ea5c
|
adding the recentering back into the non hmd lean code
|
2018-07-03 11:46:59 -07:00 |
|
amantley
|
3424f412aa
|
Merge pull request #13437 from amantley/lurchfix
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
|
2018-07-03 19:38:01 +01:00 |
|
amantley
|
f216316b55
|
removed some comments and whitespace
|
2018-07-02 18:19:31 -07:00 |
|
amantley
|
47110d080f
|
removed clang induced changes to MyAvatar.cpp
|
2018-07-02 17:06:16 -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
|
c9c222a253
|
added the failsafe code to the stepping
|
2018-06-29 11:33:42 -07:00 |
|
amantley
|
15a17ae32a
|
finished the step detection, need to finish the failsafe
|
2018-06-28 18:36:13 -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 |
|
Angus Antley
|
2307c8e24a
|
more work on the mode threshold
|
2018-06-28 15:40:42 +01: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
|
7b49ae4950
|
added the within threshold of height function and to do: the mode computation
|
2018-06-27 14:23:24 -07:00 |
|
Zach Fox
|
cfc8c0fb09
|
Implement MS16257: Remove 'clear overlay when moving' setting and code
|
2018-06-27 14:07:04 -07:00 |
|
amantley
|
3893b7e339
|
added the head angular velocity check
|
2018-06-27 10:37:54 -07:00 |
|
amantley
|
8cf59783d1
|
removed white space
|
2018-06-27 09:20:46 -07:00 |
|
amantley
|
be6fadbc2d
|
Merge remote-tracking branch 'upstream/master' into integratedStepping
|
2018-06-27 09:16:43 -07:00 |
|
Dante Ruiz
|
3cf36bed55
|
making small adjustments
|
2018-06-26 14:57:15 -07:00 |
|
Dante Ruiz
|
1fec900ba6
|
disable flying by default
|
2018-06-26 13:31:59 -07:00 |
|
David Rowe
|
af3861def8
|
Code review
|
2018-06-25 16:33:05 +12:00 |
|
David Rowe
|
40fb627504
|
Merge branch 'master' into 21892
|
2018-06-25 16:04:44 +12:00 |
|
amantley
|
3027f8242c
|
added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp
|
2018-06-21 17:23:03 -07:00 |
|
amantley
|
e4ca6c6303
|
added the fixes for the lurch that happens when driving or flying
|
2018-06-21 11:22:26 -07:00 |
|
amantley
|
8fc04776f9
|
starting to implement the step detection code in MyAvatar.cpp
|
2018-06-21 10:59:07 -07:00 |
|
SamGondelman
|
8014f61243
|
loading priorities for avatars and attachments
|
2018-06-20 12:29:28 -07:00 |
|
David Rowe
|
be4b929301
|
Fix cauterization when reparent entity to a different joint
|
2018-06-16 16:31:06 +12:00 |
|
David Rowe
|
4dd6ba1d18
|
Fix Mac crash
|
2018-06-16 16:29:45 +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 J. Thibault
|
b8379045a8
|
Fix MyAvatar::isReadyForPhysics() in serverless domains.
|
2018-06-11 09:53:34 -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 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Andrew Meadows
|
9ae19714b5
|
also update queryAACube for children of worn entities
|
2018-06-01 16:38:57 -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 |
|