Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 07:34:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87168 commits 25 branches 0 tags 1.1 GiB
Commit graph

1828 commits

Author SHA1 Message Date
David Rowe
e5c58d5ba5 Fix JSDoc typo noticed in passing 2019-07-30 11:37:20 +12:00
David Rowe
ade85ad8c0 Update API JSDoc with glTF 2019-07-30 10:41:07 +12:00
David Rowe
cf9e563458 Miscellaneous JSDoc fixes noticed in passing 2019-07-19 08:37:10 +12:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
Simon Walton
597477614c Debugging for missing Avatar Data 2019-07-03 17:51:05 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33 
DOC-33: MyAvatar API JSDoc catch-up
 2019-06-11 15:05:06 -07:00
Anthony J. Thibault
897e276188 Compile fix 2019-06-10 18:34:11 -07:00
Anthony J. Thibault
6c4e7cd805 AvatarData: arranged order of size computation reflect order in the packet. 2019-06-10 18:00:54 -07:00
Anthony J. Thibault
889a5d2bda AvatarData: Add FAR_GRAB_JOINTS_SIZE to byteArraySize computation. 2019-06-10 17:58:46 -07:00
Anthony J. Thibault
2fa16719cf AvatarData: Fix avatarDataByteArray max size computation 
The previous size calculation did not take the presence of the hand controller section into account.
This could sometimes result in a buffer overrun of the network buffer as identified in a debug build.

https://highfidelity.atlassian.net/browse/BUGZ-526
 2019-06-10 16:52:44 -07:00
David Rowe
231d1373b6 Update MyAvatar, Avatar JSDoc per recent changes 2019-06-05 08:38:34 +12:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh 2019-05-23 09:35:14 -07:00
SamGondelman
264051ed6d fix myavatar setSkeletonModelURL 2019-05-21 10:40:58 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
Simon Walton
7c405b0714 Don't substitute own avatar; FST URL regex fixes; better error handling 2019-04-29 18:20:54 -07:00
Simon Walton
60389017a4 Merge from master, including avatar protocol change 
Tony had added HandController version-type.
 2019-04-26 18:51:41 -07:00
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Shannon Romano
324bbadcfc
Merge pull request #15466 from Atlante45/fix/traits-parsing 
Case 22255: Add size checks for trait packets parsing
 2019-04-26 13:29:50 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux 
Avatar network bandwidth optimization
 2019-04-26 10:16:30 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait 
Skeleton Trait Implementation
 2019-04-26 10:14:47 -07:00
Clement
d36fd6eaa3 Ensure we don't read past the end of packet buffers 2019-04-25 16:22:01 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
luiscuenca
b10aca10d4
Fix code standard issues 2019-04-23 09:45:39 -07:00
Simon Walton
c03839e49f Fix threaded issues; add verify failed flag to avatar identity packet 
Bump packet version
 2019-04-23 09:26:17 -07:00
Anthony Thibault
d7babe6fbf Added data rates for new hand controller section 2019-04-22 16:16:55 -07:00
luiscuenca
9c90a2b684
more fixes 2019-04-22 13:17:42 -07:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations 
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
 2019-04-22 11:02:13 -07:00
luiscuenca
1ad197df26
Send avatar skeleton trait 2019-04-16 17:40:43 -07:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989 
Case 21989: AvatarList and AvatarManager JSDoc
 2019-04-12 12:27:29 -07:00
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