simplify avatar proximity check for 1p transition
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
test
Merge remote-tracking branch 'upstream/master'
testing avatar touch
Merge remote-tracking branch 'upstream/master'
testing avatar touch
Merge remote-tracking branch 'upstream/master'
merge
testing avatar touch
Merge remote-tracking branch 'upstream/master'
#19351 - Atmosphere shaders should be handled per-pixel instead of per-vertex.
Merge branch 'master' of https://github.com/worklist/hifi into 19351
committing latest skeleton-separation changes (more to come as Andrzej and I work on it more)
merge
merge
merge
Merge remote-tracking branch 'upstream/master'
cleanup