Commit graph

2026 commits

Author SHA1 Message Date
Angus Antley
44a6c7df5f added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot 2018-08-24 07:17:17 +01:00
amantley
0e0561bb24 latest rotate code 2018-08-23 17:59:18 -07:00
John Conklin II
1320a34a18
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON
Don't include old attachment data on new avatar recordings
2018-08-23 10:51:33 -07:00
Angus Antley
30ef544c6d starting the c++ version of shoulder rotation 2018-08-23 15:57:14 +01:00
Wayne Chen
9518b8cdaf rearrangement 2018-08-22 15:46:02 -07:00
Wayne Chen
c32cc1ead2 adding implementation 2018-08-22 15:42:15 -07:00
luiscuenca
b3d127c953 Fix flickering 2018-08-22 14:31:34 -07:00
amantley
9dfaf32b72 fixed the step animation but it still needs work 2018-08-22 14:12:19 -07:00
amantley
2dd812935f Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-22 12:57:16 -07:00
amantley
1e3ca6f902 added quicker follow code and added head to rotate calculation 2018-08-22 12:57:06 -07:00
amantley
456b8bf2a9 tweaked the animvars callback to update the spine2 position 2018-08-22 09:36:52 -07:00
luiscuenca
5f4903f884 Record entities 2018-08-22 08:53:51 -07:00
amantley
1fabc77244 latest update to stop lurching, and allow leaning, and stop perma leans 2018-08-21 12:34:05 -07:00
Stephen Birarda
1723f3d3d8 don't use entity tree to clear all avatar entities 2018-08-21 12:21:29 -07:00
Stephen Birarda
a177e49877 Revert "send attachment clears through setAvatarEntityData"
This reverts commit 25876bca63.
2018-08-21 12:18:11 -07:00
Stephen Birarda
25876bca63 send attachment clears through setAvatarEntityData 2018-08-21 10:32:05 -07:00
Stephen Birarda
e33f349d53 fix flagging for avatar entity update/delete 2018-08-21 10:32:05 -07:00
Stephen Birarda
ea7c0e923a make client traits handler a unique ptr in AvatarData 2018-08-21 10:31:15 -07:00
Stephen Birarda
a0df68f32f move skeleton model URL emit to AvatarData 2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a remove skeleton from identity, handle in clients 2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7 add skeleton trait sending to Agent, queuing in AvatarMixer 2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a initial trait packet sending on skeleton URL change 2018-08-21 10:31:14 -07:00
amantley
2dcdd60750 added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes 2018-08-20 17:32:52 -07:00
amantley
baa17395f0 Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-20 16:47:21 -07:00
amantley
94026fb4dd added activate(rotation) to prephysics update 2018-08-20 16:47:14 -07:00
amantley
471bb28545 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-20 09:50:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
Seth Alves
0a5c96ecc1
Merge pull request #13792 from luiscuenca/attachmentsAPImgr
Attachments API returns avatar entities
2018-08-13 14:21:13 -07:00
amantley
c2612af7a8 changed the spine stretch limit, will check the scale implications next 2018-08-10 17:10:33 -07:00
luiscuenca
dd93055d89 Convert and load attachments when rig is ready 2018-08-10 16:15:30 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
amantley
f26d6b8c3d cleaned up code and changed the forward offset for the default eyes when there is no neck bone 2018-08-09 12:15:35 -07:00
luiscuenca
9ca0ee05dc Fix wanings 2018-08-09 12:13:03 -07:00
amantley
a3f2fd1f23 removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization 2018-08-09 11:33:27 -07:00
luiscuenca
8c121a531d Turn attachments into avatar entities 2018-08-09 10:35:15 -07:00
amantley
c774dd7f5b debugging to solve the no-neck crazy scale problem 2018-08-08 17:52:22 -07:00
r3tk0n
32165dff40 Fixed rotations in MyAvatar::goToFeetLocation() 2018-08-07 14:31:48 -07:00
amantley
1353406254 more whitespace 2018-08-07 12:56:28 -07:00
amantley
84619e7adc cleaned up to match coding standards 2018-08-07 10:40:11 -07:00
MuteTab
b590ff793a New function for changing location in domains such that the AVatar's leg-length is taken into account. 2018-08-06 20:26:44 -07:00
amantley
1ad6b041cd updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed 2018-08-06 18:36:32 -07:00
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