Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading
...
Case 21415: Avatars stay behind after they disconnect
2019-04-01 18:04:42 -07:00
danteruiz
fcb838a71f
addressing review requests
2019-04-01 15:43:04 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates
2019-04-01 12:24:46 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements
...
Avatar hero zone improvements
2019-03-29 10:49:06 -07:00
danteruiz
04d9858f02
fixing remaining issues
2019-03-28 11:43:53 -07:00
danteruiz
40d424a01d
avatar fading
2019-03-27 16:42:34 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates
2019-03-27 15:49:39 -07:00
Clement
88a19f26e2
Use process function for overrides
2019-03-27 15:44:32 -07:00
Clement
3221e1dbd5
Simplify packing/unpacking for easier extension
2019-03-27 15:44:32 -07:00
Clement
d7d5938c20
Pack all simple traits
2019-03-27 15:44:32 -07:00
Clement
483b7a67b9
Fix simple traits vector bad init
2019-03-27 15:44:32 -07:00
Simon Walton
e62270fccf
Fixes for inline jsdoc
2019-03-27 12:00:30 -07:00
Simon Walton
6b21fc1af7
Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements
...
Fix jsdoc conflict, also minor clean-up.
2019-03-27 10:54:49 -07:00
David Rowe
b78ae80ae6
Address review comments and add further examples
2019-03-26 09:40:47 +13:00
Simon Walton
d7a1ecdbb3
Expose hero-status to scripts
2019-03-22 17:19:39 -07:00
Wayne Chen
d382893e75
staging avatar inputs for ignore radius
2019-03-22 14:16:28 -07:00
David Rowe
7445d73857
Merge branch 'master' into M21222
...
# Conflicts:
# libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
David Rowe
24286273b4
Miscellaneous JSDoc fixes
2019-03-09 19:22:07 +13:00
Sam Gateau
3464fe09c1
Applying the hero changes to master soon to be rc81
2019-03-08 18:13:20 -08:00
David Rowe
4779a6b156
Merge branch 'master' into M21222
2019-03-09 07:57:53 +13:00
David Rowe
eba89e8a80
Revise Avatar JSDoc as a result of MyAvatar JSDoc work
2019-03-08 13:50:03 +13:00
David Rowe
e79594ef53
Fill in and tidy Avatar JSDoc
2019-02-27 09:53:11 +13:00
David Rowe
7f1ae63439
Revise current Avatar API JSDoc
2019-02-21 14:30:38 +13:00
David Rowe
f58a5db0b0
Reorganize JSDoc inheritance for MyAvatar and Avatar
2019-02-19 09:47:51 +13:00
SamGondelman
d50904dd4a
fix avatar deadlock
2019-02-15 17:08:24 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
...
Case 21159: fixes for more grab bugs
2019-02-14 16:52:03 -08:00
Andrew Meadows
ed8481ead9
fix grab bugs
2019-02-12 14:04:56 -08:00
Anthony Thibault
eee41bc41e
Revert "Pack all non-instanced traits"
...
This reverts commit 5b7d7b8833
2019-02-12 13:46:21 -08:00
Anthony Thibault
5b7d7b8833
Pack all non-instanced traits
...
Previously this code only would pack the skeletonModelURL trait. Which is technically not a bug, because there it is the only non-instanced trait.
But, we plan to add new traits in the future. So, lets fix this now.
2019-02-08 08:53:43 -08:00
Simon Walton
08b21109c1
Include the new scale float in min remaining size calculation
2019-01-30 13:55:12 -08:00
luiscuenca
a6dce5dd84
Merge branch 'master' into multiSphereAvatar04
2019-01-28 17:48:22 -07:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it
...
case 20701: fixes for grab
2019-01-28 15:57:36 -08:00
luiscuenca
f54f9e5bfd
Merge branch 'master' into multiSphereAvatar04
2019-01-25 13:54:01 -07:00
Shannon Romano
28edb472fc
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale
...
20565 Avatar::_collideWithOtherAvatars does not scale
2019-01-25 11:06:36 -08:00
Andrew Meadows
ee3fde9df1
unravel spaghetti, prefer std over Qt containers
2019-01-24 14:39:00 -08:00
Anthony Thibault
77fb20801f
Bug fixes for avatarData protocol
...
Two issues were recently discovered after they were introduced by PR #14733
1) The Avatar Mixer would sometimes have incorrect translation scale when splitting BulkAvatarData across multiple MTUs
2) Old avatar recordings would no longer work properly.
This PR should fix both of these issues.
2019-01-24 14:24:11 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision
...
Avatar Protocol: Fix for precision issues with translation
2019-01-23 14:07:58 -08:00
raveenajain
3f2aa56187
feedback changes
2019-01-21 13:24:07 -08:00
Anthony Thibault
5dbd62cc67
code review feedback
2019-01-18 17:52:53 -08:00
raveenajain
d2e37d0c90
my and other avater changes, if setting toggled can pass through other avatar
2019-01-18 16:50:44 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
...
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Shannon Romano
c764f5182f
Merge pull request #14717 from roxanneskelly/Case20277
...
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
2019-01-17 15:36:31 -08:00
Anthony Thibault
286f23d512
Updated protocol version and fixed bugs
2019-01-17 15:19:54 -08:00
John Conklin II
d64858b1c7
Merge pull request #14724 from sethalves/fix-excessive-cauterization-update
...
case 15942: fix bug that caused avatar cauterization code to run constantly
2019-01-17 12:59:57 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel
...
Case 20580: Trying to fix wearables and avatar app
2019-01-17 11:25:30 -08:00
Seth Alves
1104e56bc3
fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level
2019-01-16 13:23:27 -08:00
birarda
a63c2b3e29
pepper AssociatedTraitValues with some needed comments
2019-01-16 10:15:04 -08:00
Anthony Thibault
104084d811
Avatar Mixer Protocol: Normalize translation before compression
2019-01-15 18:56:09 -08:00
luiscuenca
a7f143dbce
Merge branch 'master' into multiSphereAvatar04
...
# Resolved Conflicts:
# interface/src/avatar/MyAvatar.h
# interface/src/avatar/OtherAvatar.cpp
2019-01-15 18:27:04 -07:00
Clement
8480624797
Limit upstream data to avatar mixer
2019-01-15 14:18:53 -08:00
