John Conklin II
70c7ffcc71
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002
...
fix MyAvatar-vs-OtherAvatar collisions
2018-09-26 15:21:18 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
...
fix for deadlock in other avatar entity removal from tree
2018-09-26 09:58:26 -07:00
Andrew Meadows
a3f946dee1
activate OtherAvarar in physics sim on position change
2018-09-24 16:27:37 -07:00
Andrew Meadows
c1d65f5118
update avatar shape after it loads
2018-09-24 12:07:08 -07:00
Stephen Birarda
b31837168d
fix bad lock, optimize some operations, clarify comment
2018-09-24 11:27:20 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
Stephen Birarda
3a7785d10f
fix for deadlock in other avatar entity removal
2018-09-18 17:52:24 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip
...
Safe Teleport Target
2018-09-14 15:11:18 -07:00
luiscuenca
c5669ef1f5
better property names
2018-09-13 15:22:18 -07:00
luiscuenca
6a9a898b62
make updateCollisionCapsule private
2018-09-13 15:07:34 -07:00
luiscuenca
ceccc6d6ec
make getCollisionCapsule thread safe
2018-09-13 14:49:35 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
luiscuenca
b517808bc2
Fix smaller size avatar capsule and land on detailed mesh
2018-09-12 21:24:19 -07:00
Stephen Birarda
b1f44d2ad7
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
2018-09-12 12:30:15 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
...
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb
...
Avatar loading orb now indicates loading status
2018-09-11 18:01:40 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Anthony Thibault
23ed314250
Fix for missing return warning
2018-09-11 14:50:50 -07:00
Dante Ruiz
b665dbe13e
finished requested changes
2018-09-11 14:18:12 -07:00
Anthony Thibault
bc5d9a46a2
Avatar loading orb now indicates status
...
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
2018-09-11 13:12:46 -07:00
luiscuenca
fedea6e84d
Comply with review comments
2018-09-11 12:23:25 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling
2018-09-10 10:15:49 -07:00
luiscuenca
a9f676354b
Only invisible pointers and scale fix
2018-09-10 08:54:53 -07:00
Stephen Birarda
adac872a11
clear other avatars in agent on avatar mixer disconnect
2018-09-07 15:04:14 -07:00
luiscuenca
d09391faa5
Fix invisible error
2018-09-07 12:17:40 -07:00
luiscuenca
02065518cb
Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip
2018-09-07 11:57:48 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
...
Scale Collision Pick to match parent
2018-09-07 11:54:02 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling
2018-09-07 09:30:39 -07:00
SamGondelman
ed7f993c0d
avatar mixer and manager perf improvements and cleanup
2018-09-06 16:57:20 -07:00
amantley
90a51e6181
added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area
2018-09-06 13:12:48 -07:00
sabrina-shanman
727b62144f
Fix MyAvatarHeadTransformNode not using avatar scale
2018-09-06 12:03:13 -07:00
Dante Ruiz
200f6d540a
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-09-06 09:59:51 -07:00
amantley
6fb335429d
starting to re-implement the walking state detection for smoothwalking
2018-09-05 17:55:27 -07:00
luiscuenca
abb632afda
Update capsule when scale/load and teleport without safe landing
2018-09-05 16:51:34 -07:00
amantley
73e628bb8d
merge with master fixes
2018-09-05 14:42:49 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
...
HMD mode bug fix for avatars with no eyes
2018-09-05 10:57:21 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager
...
Miscellaneous low-level performance improvements
2018-09-05 10:12:05 -07:00
Simon Walton
262dbaf5ed
Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling
2018-09-04 15:27:41 -07:00
Simon Walton
695fabf4f5
Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling
2018-09-04 15:27:18 -07:00
Simon Walton
6ae2ca1576
Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
...
Merge of Samuel's change to use simple sort instead of priority queue
2018-09-04 15:26:26 -07:00
Anthony Thibault
b21fa1037f
Code review feedback and bug fixes for calibraiton matrices
2018-09-04 11:55:52 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting
...
Collision Pick Parenting
2018-08-31 14:43:55 -07:00
SamGondelman
d01b438cb3
CR
2018-08-31 11:25:17 -07:00
SamGondelman
5f08ed5027
misc perf improvements
2018-08-30 16:55:15 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix
...
Avatar without Neck Joint bug 14620
2018-08-30 14:52:44 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange
...
Hand Azimuth Controls Shoulder Rotation
2018-08-30 13:59:00 -07:00
John Conklin II
bf0ab865bb
Merge pull request #13903 from birarda/bug/av-entity-delete-master
...
send MyAvatar avatar entity updates through entity tree
2018-08-30 10:25:31 -07:00
Dante Ruiz
8c77820e30
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-30 09:45:41 -07:00
