Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 16:32:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75136 commits 75 branches 59 tags 1.2 GiB
Commit graph

75136 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roxanne Skelly
2566f633f3 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-11 14:56:05 -08:00
Roxanne Skelly
4ed5f642ed Case20615 - Changing Avatars doesn't update to everyone intermittently 
There were two problems:
1) If an update to a trait (simple or instance) was not sent because
there was an outstanding (unacked) message, it would not be resent
until a new trait was updated.  Expected - it should be sent when the
ack for the outstanding packet is received.

2) Trait versions were improperly being set to zero (the default)
when an ack is received.
 2019-01-11 14:51:44 -08:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities 
case 20020: faster avatar entities
 2019-01-11 14:13:05 -08:00
Shannon Romano
4845220d16
Merge pull request #14682 from roxanneskelly/Case20377 
Bulk Avatar Traits related ack data was not reset in certain cases when it should be
 2019-01-10 20:15:52 -08:00
Andrew Meadows
bc19689910 remove unnecessary culling of properties 2019-01-10 17:32:52 -08:00
Roxanne Skelly
df97ca57b4 Bulk Avatar Traits related ack data was not reset when avatars were 
ignored, etc.
 2019-01-10 12:04:48 -08:00
Andrew Meadows
16da42723e use glm::abs() instead of absf() 2019-01-10 10:15:39 -08:00
Andrew Meadows
f7b7db5ab4 fix warning on OSX, use correct format for float literals 2019-01-10 09:14:37 -08:00
Andrew Meadows
0098dedcbb don't update server for AvatarEntity queryAACube 2019-01-09 18:25:12 -08:00
John Conklin II
83cb60f46f
Merge pull request #14621 from birarda/feat/message-cycle-cap 
cap the number of considered message channels in PacketQueue
 2019-01-09 17:43:36 -08: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
b9667a0679 fix merge conflict after rebase 2019-01-09 17:28:00 -08:00
Andrew Meadows
8206daf1a6 send update when loading AvatarEntity from Settings 2019-01-09 17:28:00 -08:00
Andrew Meadows
e2d6e6f3dc more correct AvatarEntityData settings when switching domains 2019-01-09 17:28:00 -08:00
Andrew Meadows
9d6acf007a fix build after rebase 2019-01-09 17:28:00 -08:00
Andrew Meadows
27318a3f17 update AvatarEntitData blobs before writing to JSON during recordings 2019-01-09 17:28:00 -08:00
Andrew Meadows
c998ddbb9e ScriptableAvatar::setAvatarEntityData() works 2019-01-09 17:28:00 -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
cbda905e3b fix typo 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
4dd6e23fef fix typo in comment 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
9b253690db bump packet version number 2019-01-09 17:28:00 -08:00
Andrew Meadows
43fc86fe54 restore non-human-readable avatarEntityDataSettings format 2019-01-09 17:27:14 -08:00
Andrew Meadows
dedc14434b fix compile warnings on windows 2019-01-09 17:27:14 -08:00
Andrew Meadows
d622635a71 fix wording in comment to reflect new 'HostType' parameter 2019-01-09 17:27:14 -08:00
Andrew Meadows
320ba9177c remove cruft 2019-01-09 17:27:14 -08:00
Andrew Meadows
121a591023 delete old AvatarEntities on domain reset on login 2019-01-09 17:27:14 -08:00
Andrew Meadows
c4115bece3 remove unused ScriptEngine instance 2019-01-09 17:27:14 -08:00
Andrew Meadows
09f3b8f485 add bit of sanity checking for incomming AvatarEntities data 2019-01-09 17:27:14 -08:00
Andrew Meadows
0083c77280 add EntityTypes::extractEntityTypeAndID(), remove one spaghetti 2019-01-09 17:27:14 -08:00
Andrew Meadows
1815d71158 fix data corruption bug 2019-01-09 17:27:14 -08:00
Andrew Meadows
6da8c5545e remove debug code 2019-01-09 17:27:14 -08:00
Andrew Meadows
ce660bee9b fix compile errors after rebase 2019-01-09 17:27:14 -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
fe2ee68b79 add EntityItemProperties::copyFromJSONString() 2019-01-09 17:27:14 -08:00
Andrew Meadows
ec384d7dbb more correct reload AvatarEntityData from settings 2019-01-09 17:27:14 -08:00
Andrew Meadows
0ed936520d MyAvatar saving to settings works again 2019-01-09 17:27:14 -08:00
Andrew Meadows
e37b5b52f0 correctly load AvatarEntities from settings redux 2019-01-09 17:27:14 -08:00
Andrew Meadows
026c6301a6 correctly load AvatarEntities from settings 2019-01-09 17:27:14 -08:00
Andrew Meadows
263d6cb7ad only change parentID=AVATAR_SELF_ID for non-clientOnly case 2019-01-09 17:27:14 -08:00
Andrew Meadows
e4cc3fa976 minor cleanup 2019-01-09 17:27:14 -08:00
Andrew Meadows
01fc442695 save AvatarEntities settings as strings 2019-01-09 17:27:14 -08:00
Andrew Meadows
d1927340f5 remove redundant addToNeedsParentFixupList() 2019-01-09 17:27:14 -08:00
Andrew Meadows
d3fea94540 send AvatarEntities via raw data packet 2019-01-09 17:27:14 -08:00
John Conklin II
816de0d684
Merge pull request #14672 from SimonWalton-HiFi/avatar-mixer-entities-stats 
Track avatar-mixer send-stats with finer granularity
 2019-01-09 17:14:51 -08:00