Shannon Romano
5e8e44f97b
Merge pull request #15316 from amantley/bugSetRotation
...
Bug fixed for MyAvatar.getJointRotation(name, quat) and MyAvatar.setJointRotation(name, quat)
2019-04-12 12:23:03 -07:00
David Rowe
38e21dcaa2
Doc review
2019-04-11 11:04:02 +12:00
David Rowe
ca3f45163f
Merge branch 'master' into M21989
2019-04-11 10:37:34 +12:00
SamGondelman
924bf53698
extra check to make sure we remove material from MyAvatar
2019-04-05 16:22:16 -07:00
Angus Antley
9afbf76ec1
removed unnecessary getFauxJointIndex call, this is handled in getJointIndex
2019-04-04 10:22:24 -07:00
Angus Antley
72264203db
corrected the lock positions to cover the getJointIndex calls
2019-04-04 10:08:50 -07:00
David Rowe
2a17ad3da5
AvatarList and AvatarManager JSDoc
2019-04-04 10:11:54 +13:00
Angus Antley
857a4ab739
enabled MyAvatar.get and .set rotation
2019-04-03 13:04:55 -07:00
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
Roxanne Skelly
6317ceb9b3
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
...
Loading orb was created for all other avatars upon OtherAvatar object
creation without checking the ignore list.
2019-01-15 13:34:29 -08:00
SamGondelman
68e15c6c07
fixes from 78
2019-01-14 13:36:21 -08:00
luiscuenca
19701ef333
Fix scale and add rayTest
2019-01-11 15:36:07 -07:00
Andrew Meadows
9ea6968e35
fix bug where attached AvatarEntities do not update in timely fashion
2019-01-09 17:40:18 -08:00
Andrew Meadows
63ed0a3a98
move blob conversion recipes to EntityItemProperties
2019-01-09 17:28:00 -08:00
Andrew Meadows
855497e604
MyAvatar.updateAvatarEntity(id, data) works in theory
2019-01-09 17:28:00 -08:00
Andrew Meadows
a4be4fb6c0
MyAvatar.setAvatarEntityData() works
2019-01-09 17:28:00 -08:00
Andrew Meadows
329ec84104
MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings
2019-01-09 17:28:00 -08:00
Andrew Meadows
cbcd70aee6
namechanges and comments to help clarify necessary fixes
2019-01-09 17:28:00 -08:00
Andrew Meadows
9f404ef006
Agent bots can manipulate AvatarEntities again
2019-01-09 17:28:00 -08:00
Andrew Meadows
61b8d005b5
scripts can edit AvatarEntities again
2019-01-09 17:27:14 -08:00
Andrew Meadows
6c81e8845b
cleanup
2019-01-09 17:27:14 -08:00
Andrew Meadows
026c6301a6
correctly load AvatarEntities from settings
2019-01-09 17:27:14 -08:00
Simon Walton
1245abbb53
Merge branch 'master' into avatar-mixer-entities-stats
2019-01-09 16:07:26 -08:00
Simon Walton
73d688610f
Track stats for total AvatarData bytes, traits bytes and identity bytes
2019-01-08 18:33:00 -08:00
Roxanne Skelly
37d4846722
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 11:56:48 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
...
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
Roxanne Skelly
0a76554d57
Remove debugging code
2019-01-05 14:04:26 -08:00
Roxanne Skelly
6d791a80c2
Bump protocol version for BulkAvatarTraits and add some guard code
...
around packet parsing.
2019-01-04 19:04:01 -08:00
luiscuenca
d630fe9dbd
Add menu checkbox to toggle collisions with other avatars
2019-01-04 16:38:48 -07:00
Ryan Huffman
b680e9c52a
Update avatar packager with CR feedback
2019-01-04 09:59:17 -08:00
Roxanne Skelly
2b1547b9fa
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-03 13:39:19 -08:00
Thijs Wenker
c95da0a595
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
...
# Conflicts:
# interface/src/Application.cpp
2019-01-03 22:17:54 +01:00
Roxanne Skelly
443b54d931
comment and naming cleanup
2019-01-03 11:25:39 -08:00
Seth Alves
78aff6e95c
grab js api; send grab information through trait system
2019-01-03 08:17:52 -08:00
Ryan Huffman
c21d037800
Fix marketplace uploader not working with projects larger than 128MB
2018-12-27 17:51:27 -08:00
Ryan Huffman
b717188ed0
Update avatar project styling
2018-12-22 21:57:09 -08:00
Roxanne Skelly
3a282045ff
Checkpoint trait-level flow control
2018-12-21 15:48:58 -08:00
Stephen Birarda
e3e400c86f
Merge pull request #14549 from birarda/bug/no-initial-send
...
fix for initial send of non-instanced trait
2018-12-07 12:02:08 -08:00
Brad Hefta-Gaub
9428f1de33
Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst
...
Don't fetch avatars' .fst files from within the AvatarData class
2018-12-07 12:01:58 -08:00
birarda
51fd742722
fix for initial send of non-instanced trait
2018-12-07 11:17:44 -08:00
Stephen Birarda
fb3cdabd87
Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock
...
fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer
2018-12-06 17:28:45 -08:00
Simon Walton
e03104cad5
Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst
...
Remove the code that was fixed in the conflicting PR - it's
now fixed in the new location.
2018-12-05 17:58:38 -08:00
Antonina Savinova
2dcfea5f7c
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak
...
Fix minor avatar-mixer memory leaks
2018-12-05 10:29:29 -08:00
Simon Walton
f3236e0843
Remove FST joint members from AvatarData
2018-12-04 10:45:32 -08:00
Simon Walton
eb097af796
Remove all .fst downloads from AvatarData and its derived classes
2018-12-03 17:42:39 -08:00
Simon Walton
9315c546d3
Initial version - move updateJoints() to derived class
2018-12-03 16:26:47 -08:00
birarda
c959dd7024
release avatar entity and traits locks sooner to avoid deadlock
2018-12-03 14:57:38 -08:00
Clement
181f2b4263
Fix Agent crash on shutdown
2018-11-28 18:40:52 -08:00
Simon Walton
e10936ec34
Delete network query resources for failed queries
2018-11-26 18:26:25 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
luiscuenca
dceeadd99a
change transit speed
2018-11-05 19:35:37 -07:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix
...
Fix avatars remain stuck in place for other users intermittently
2018-10-29 15:03:43 -07:00
luiscuenca
056fe338e1
Apply transit logic if avatar instance is client side
2018-10-27 07:15:31 -07:00
luiscuenca
767f4e9d6d
Return server position
2018-10-26 17:16:43 -07:00
luiscuenca
62e4b3fead
Avatar mixer gets the updated position
2018-10-26 16:02:17 -07:00
Simon Walton
b6f259fc42
Fix incorrect merge-resolution
2018-10-24 13:17:45 -07:00
Simon Walton
e22e0ecb04
Merge branch 'master' into avatar-mixer-improvements
2018-10-24 10:39:23 -09:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation
...
Add animations to Avatar Transit
2018-10-24 10:51:21 -07:00
Simon Walton
0a78eeaf1a
Merge branch 'master' into avatar-mixer-improvements
2018-10-23 15:56:56 -07:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2
...
Display resource-access events in marketplace item tester
2018-10-23 15:18:30 -07:00
Stephen Birarda
b789fa96f8
Merge pull request #14192 from Atlante45/fix/traits-race
...
Prevent race on internal client traits members
2018-10-23 14:53:11 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f
Hold flickering fixed and refactor
2018-10-20 15:22:25 -07:00
Brad Hefta-Gaub
23ddb7dea6
Merge pull request #14207 from Atlante45/fix/white-spheres
...
Remove pending avatars data structure
2018-10-20 12:09:51 -07:00
Brad Hefta-Gaub
c6fff83805
Merge pull request #14145 from ctrlaltdavid/M17223
...
JSDoc fixes
2018-10-19 16:16:19 -07:00
Simon Walton
0b2ee35907
Merge branch 'master' into avatar-mixer-improvements
2018-10-18 14:13:39 -07:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3
2018-10-17 13:57:21 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1
...
move grab pseudo-properties (userData) into first-class EntityItemProperties
2018-10-17 13:29:20 -07:00
Simon Walton
0b77eb5e9c
Control UUID inclusion in avatar data with new param
...
Increase estimate of avatars to be sent; remove start/end segment
in avatar identity writes.
2018-10-16 14:25:38 -07:00
Clement
3bfc5011f5
Remove _pendingAvatars struct
2018-10-12 17:57:48 -07:00
Clement
1bcbda7ad6
Prevent race on internal client traits members
2018-10-11 16:16:24 -07:00
luiscuenca
de1b6e717f
Cancel animation on chained trasits
2018-10-11 11:35:56 -07:00
Simon Walton
6f659db3b5
Merge branch 'master' into avatar-mixer-improvements
2018-10-08 15:18:29 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3
2018-10-08 12:59:34 -07:00
John Conklin II
dc7a5c0867
Merge pull request #14147 from birarda/bug/large-traits
...
suppress traits larger than INT16_MAX bytes
2018-10-08 10:27:52 -07:00
Anthony Thibault
335c60e6b8
Reduce the glitches of far away animating avatars
...
Currently, the avatars that are further then 10 meters away have a
very aggressive 15 degree rotation threshold, used to reduce the
amount of rotation joint changes sent over the network.
This PR tunes both the distances and rotation thresholds used for
this LOD culling.
2018-10-05 17:29:25 -07:00
Stephen Birarda
82170a66ed
avoid backwards seek for skipped trait deletes
2018-10-05 15:07:54 -07:00
Stephen Birarda
88f76ac760
suppress traits larger than INT16_MAX bytes
2018-10-05 09:46:55 -07:00
David Rowe
539c280281
Fill in missing JSDoc stubs in AvatarList and AvatarManager
2018-10-05 15:13:13 +13:00
Simon Walton
0ca112f7b9
Restore missing abs() to quaternion dot-product
...
See https://github.com/highfidelity/hifi/pull/14138
2018-10-04 16:40:44 -07:00
John Conklin II
84178faee3
Merge pull request #14137 from hyperlogic/bug-fix/glitchy-movement-for-avatars
...
Bug fix for rotation culling in AvatarData::toByteArray()
2018-10-04 13:12:28 -07:00
luiscuenca
bb98457d09
Fix avatars transit on domain enter
2018-10-03 16:23:09 -07:00
Anthony Thibault
c0ae95f853
Bug fix for rotation culling in AvatarData::toByteArray()
...
The commit 5a0de0f1035a0de0f103
2018-10-03 12:54:49 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
Seth Alves
834699fa12
Move grab pseudo-properties (userData) into first-class EntityItemProperties.
2018-10-02 08:54:12 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit
...
Simple avatar transit
2018-10-01 16:24:46 -07:00
Simon Walton
4534b87ea0
Fix error passing rvalue ref as lvalue
2018-09-28 18:24:59 -07:00
Simon Walton
18c1371321
Process multiple avatars in an AvatarIdentity message
2018-09-28 17:53:06 -07:00
Simon Walton
1e79329e83
Access joint data via C pointer instead of operator[]
...
QVector::detach() was showing up in the linux profiles - it's
related to the copy-on-write capability. Const QVectors
don't use it though.
Also a bug fix for the minimum joint space needed.
2018-09-26 14:23:52 -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
Simon Walton
13890f1d16
Use local ID in place of UUID in a couple more cases
2018-09-26 09:47:26 -07:00
Simon Walton
91187ad7eb
Merge remote-tracking branch 'origin/avatar-mixer-improvements' into avatar-mixer-improvements
2018-09-25 12:10:01 -07:00
Simon Walton
f95ab1b040
Clean-up & other small changes
2018-09-25 12:07:59 -07:00
Simon Walton
07bdaeede7
Split avatar joint-data across multiple packets if necessary
2018-09-24 18:23:49 -07:00
Simon Walton
d5977612a1
Merge branch 'master' into avatar-mixer-improvements
2018-09-24 13:29:45 -07:00
Simon Walton
82b81c9076
Limit no. of joints sent per avatar to prevent lock-up
...
With this the avatar mixer will sent the full bit-vector
but only the first 111 actual joints.
2018-09-24 11:54:03 -07:00
