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
