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 |
|
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 |
|
luiscuenca
|
012cd207b3
|
No data sent during basic transit
|
2018-09-24 11:39:10 -07:00 |
|
Stephen Birarda
|
b31837168d
|
fix bad lock, optimize some operations, clarify comment
|
2018-09-24 11:27:20 -07:00 |
|
luiscuenca
|
82b14b6e9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport
|
2018-09-22 05:47:05 -07:00 |
|
Andrew Meadows
|
cf85c617a2
|
tweak avatar update priority coefs for load tests
|
2018-09-20 09:56:50 -07:00 |
|
Stephen Birarda
|
3a7785d10f
|
fix for deadlock in other avatar entity removal
|
2018-09-18 17:52:24 -07:00 |
|
luiscuenca
|
ff319ebd95
|
Bypass position updates from mixer
|
2018-09-17 09:47:22 -07:00 |
|
John Conklin II
|
65ef04ae75
|
Merge pull request #13937 from luiscuenca/stt_teleport_wip
Safe Teleport Target
|
2018-09-14 15:11:18 -07:00 |
|
luiscuenca
|
c5669ef1f5
|
better property names
|
2018-09-13 15:22:18 -07:00 |
|
luiscuenca
|
ceccc6d6ec
|
make getCollisionCapsule thread safe
|
2018-09-13 14:49:35 -07:00 |
|
John Conklin II
|
b675e6cc6b
|
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
Performance improvements for Avatar Mixer
|
2018-09-13 13:43:18 -07:00 |
|
Stephen Birarda
|
1789d51d6e
|
Revert "cycle avatar entity IDs for new avatar mixer"
This reverts commit 20912349a4 .
|
2018-09-12 12:22:07 -07:00 |
|
Stephen Birarda
|
6d3e6a661f
|
Revert "XOR incoming trait instance IDs for other avatars"
This reverts commit 9b3d9dd0f3 .
|
2018-09-12 12:20:31 -07:00 |
|
Stephen Birarda
|
4b93f9f5cd
|
Revert "use different XORed instance ID for replicas"
This reverts commit a37a19da1e .
|
2018-09-12 12:20:03 -07:00 |
|
Simon Walton
|
7136698c6b
|
Move default pose flags out of joint-positions condition
|
2018-09-12 10:49:26 -07:00 |
|
Simon Walton
|
0d72e3808c
|
Small changes per review
|
2018-09-12 10:31:26 -07:00 |
|
Stephen Birarda
|
2c056e5b22
|
Merge pull request #13912 from birarda/bug/agent-clear-avatars
handle agent avatar clear on avatar mixer disconnect
|
2018-09-11 16:34:15 -07:00 |
|
Stephen Birarda
|
a50e55b83a
|
use more efficient iterate and clear for removal
|
2018-09-10 17:06:57 -07:00 |
|
Simon Walton
|
d12376187c
|
Merge branch 'master' into avatar-mixer-scaling
|
2018-09-10 10:15:49 -07:00 |
|
Stephen Birarda
|
adac872a11
|
clear other avatars in agent on avatar mixer disconnect
|
2018-09-07 15:04:14 -07:00 |
|
SamGondelman
|
32e2a244a1
|
detailed profile range for avatar unpacking
|
2018-09-07 11:44:35 -07:00 |
|
Simon Walton
|
3dc993c841
|
Fix small error in translation delta
|
2018-09-07 09:46:21 -07:00 |
|
Simon Walton
|
741d4ba998
|
Merge branch 'master' into avatar-mixer-scaling
|
2018-09-07 09:30:39 -07:00 |
|
SamGondelman
|
ed7f993c0d
|
avatar mixer and manager perf improvements and cleanup
|
2018-09-06 16:57:20 -07:00 |
|
Andrew Meadows
|
92210f28b5
|
cleanup and use correct avatar bounding box
|
2018-09-06 16:33:30 -07:00 |
|
Andrew Meadows
|
021146e4f0
|
minor tweak to default avatar-update sort coefficients
|
2018-09-06 15:33:52 -07:00 |
|
Simon Walton
|
e1aba52c23
|
Revert to statics for priority sort weights; update defaults from Andrew
|
2018-09-06 12:09:44 -07:00 |
|
Simon Walton
|
058115b791
|
Add guard for sentJointDataOut
|
2018-09-04 10:38:18 -07:00 |
|
Simon Walton
|
c2ea05b026
|
Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling
|
2018-09-04 09:31:05 -07:00 |
|
Simon Walton
|
11a563cb38
|
Don't use temp vector for outgoing joint status - doesn't seem to be necessary
|
2018-08-31 17:40:57 -07:00 |
|
Simon Walton
|
cf5f81ab95
|
Don't memcpy quaternions as we don't use same component order on wire!
|
2018-08-31 17:04:23 -07:00 |
|
Stephen Birarda
|
a37a19da1e
|
use different XORed instance ID for replicas
|
2018-08-31 16:59:24 -07:00 |
|
Stephen Birarda
|
9b3d9dd0f3
|
XOR incoming trait instance IDs for other avatars
|
2018-08-31 16:56:22 -07:00 |
|
Stephen Birarda
|
20912349a4
|
cycle avatar entity IDs for new avatar mixer
|
2018-08-31 16:53:58 -07:00 |
|
Stephen Birarda
|
48680329ec
|
mark trait instances needing to be sent on mixer reconnect
|
2018-08-31 16:53:53 -07:00 |
|
Simon Walton
|
5a0de0f103
|
Small fixes for joint logic
|
2018-08-31 16:45:39 -07:00 |
|
Simon Walton
|
2da5338574
|
Fix couple of gcc issues
|
2018-08-31 15:24:51 -07:00 |
|
Simon Walton
|
e1d51a6c42
|
Avatar serializing: use memcpy where possible, take copy of joint data to avoid holding lock, etc
|
2018-08-31 15:06:33 -07:00 |
|
Sam Gateau
|
12ec56875e
|
Merge pull request #13867 from SamGondelman/recurse
findRayIntersection/findParabolaIntersection performance improvements
|
2018-08-30 09:49:16 -07:00 |
|
Sam Gateau
|
d9d23e7fcf
|
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars
Create N replicas of each other-avatar on the client side
|
2018-08-28 09:02:13 -07:00 |
|
luiscuenca
|
c19bd8968a
|
Fix mixer crash
|
2018-08-27 16:48:47 -07:00 |
|
luiscuenca
|
8ede6f1cd0
|
Fix removing my avatar and code standards
|
2018-08-27 06:55:52 -07:00 |
|
luiscuenca
|
ddbadf5a69
|
change to Test API
|
2018-08-24 11:59:46 -07:00 |
|
SamGondelman
|
3d048c77ba
|
Merge remote-tracking branch 'upstream/master' into recurse
|
2018-08-24 11:39:05 -07:00 |
|
luiscuenca
|
5654acf5bf
|
Fix warnings
|
2018-08-24 09:24:58 -07:00 |
|
luiscuenca
|
1fd0d7da94
|
Create API call
|
2018-08-23 18:03:27 -07:00 |
|
luiscuenca
|
3d959ca7ee
|
Refactoring and cleaning
|
2018-08-23 15:52:42 -07:00 |
|
John Conklin II
|
1320a34a18
|
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON
Don't include old attachment data on new avatar recordings
|
2018-08-23 10:51:33 -07:00 |
|