Commit graph

56047 commits

Author SHA1 Message Date
Stephen Birarda
1ed0b693da Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Clément Brisset
72bf879eb2 Merge pull request #10677 from birarda/feat/avatar-mixer-downstream
add replication to avatar mixers, fixes for audio
2017-06-14 16:44:56 -07:00
Stephen Birarda
806ebd3401 add return to queueReplicatedAudioPacket if no type match 2017-06-14 16:13:20 -07:00
Stephen Birarda
4c2fa4be64 fix indentation in AvatarMixerSlave/AvatarMixerSlavePool 2017-06-14 15:53:24 -07:00
Stephen Birarda
afc9978841 add a comment for hop over sequence in AudioMixerClientData 2017-06-14 15:20:47 -07:00
Stephen Birarda
6c2134901e Merge pull request #10695 from Atlante45/feat/replicants
Server side fix for jurisdiction listener
2017-06-14 15:13:54 -07:00
Stephen Birarda
9407a65f80 peek the nodeID to keep message in right place 2017-06-14 15:12:23 -07:00
Atlante45
3f1dfc346d Merge branch 'fix/node-leak' of github.com:Atlante45/hifi into feat/replicants 2017-06-14 15:12:13 -07:00
Stephen Birarda
e818a511b9 cleanup debug in updateReplicatedNodes 2017-06-14 15:07:48 -07:00
Stephen Birarda
54832d995d fix a typo in shouldReplicateNode 2017-06-14 15:05:58 -07:00
Ryan Huffman
67113330b3 Make replicated username list case insensitive 2017-06-14 15:03:54 -07:00
Ryan Huffman
8d5dc21de8 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 15:03:53 -07:00
Stephen Birarda
ca196f6141 Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream 2017-06-14 15:03:26 -07:00
Clément Brisset
44117ac001 Merge pull request #10694 from highfidelity/master
Update replicants branch with master
2017-06-14 15:01:22 -07:00
Stephen Birarda
bfa5df778d remove avatar entity data debug 2017-06-14 14:59:49 -07:00
Stephen Birarda
e3c3831efa only output sequence number information if debug is requested 2017-06-14 14:56:15 -07:00
Stephen Birarda
5b45beaa39 cleanup some debug from identity packet changes 2017-06-14 14:51:28 -07:00
Stephen Birarda
9ee1cf88e6 force forwarded sequence numbers from AvatarMixerSlave 2017-06-14 14:44:06 -07:00
Stephen Birarda
f2a61fa59d change incoming/outgoing seq num handling 2017-06-14 14:41:25 -07:00
Stephen Birarda
ddb6db9f6a fix repeated pushing of avatar identity seq nums 2017-06-14 14:31:22 -07:00
Stephen Birarda
50b56ec761 don't unpack avatar identity that is old 2017-06-14 14:02:22 -07:00
Ryan Huffman
7f75a5f7f5 Make replicated username list case insensitive 2017-06-14 13:57:04 -07:00
Ryan Huffman
59a420a358 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 13:53:50 -07:00
Stephen Birarda
9be016fd3e don't skip past UUID in identity packets 2017-06-14 13:26:23 -07:00
Atlante45
5777b5e805 Create one packet per node 2017-06-14 11:42:25 -07:00
Atlante45
3cc2396021 CR 2017-06-14 11:42:25 -07:00
Atlante45
a15660993d Fix comment 2017-06-14 11:42:25 -07:00
Atlante45
61eb93af35 Fix SharedNodePointer leak 2017-06-14 11:42:25 -07:00
Stephen Birarda
c132e29b06 remove conditional seek from InboundAudioStream 2017-06-14 11:42:19 -07:00
Stephen Birarda
91cef9bb7c Add stats to node data for downstream mixers 2017-06-14 11:40:57 -07:00
Stephen Birarda
4a69bc5fc7 cleanup conditionals in for avatar mixer slave identity packets 2017-06-14 11:34:33 -07:00
Stephen Birarda
ae8a0ab0e5 kill packets already include killed node ID 2017-06-14 11:29:08 -07:00
Stephen Birarda
6fc1045ee9 make sure kill packet has node ID 2017-06-14 11:26:33 -07:00
Stephen Birarda
b7d8c173c1 cleanup replicated node add or update 2017-06-14 11:22:42 -07:00
Stephen Birarda
57cd819307 Merge pull request #10690 from Atlante45/fix/node-leak
Fix for Jurisdiction listener
2017-06-14 11:15:17 -07:00
Stephen Birarda
1baff8af33 Merge pull request #10686 from seefo/fb4958
Resolved FB4958
2017-06-14 11:14:37 -07:00
Stephen Birarda
7d8ddb7b3b cleanup calls in handleReplicatedPackets 2017-06-14 11:06:58 -07:00
Stephen Birarda
324a2601fc send down replicated message to avatar mixer handling 2017-06-14 11:00:22 -07:00
Atlante45
7b62e8854c Create one packet per node 2017-06-14 10:53:36 -07:00
Howard Stearns
15a5464bab Merge pull request #10682 from zfox23/PAL_fixTabBackgroundColor
Make the PAL's tab background color white
2017-06-13 20:50:13 -07:00
Stephen Birarda
a665b880c0 Merge pull request #10683 from seefo/replicants
Added support for dropdown type to tables in domain settings
2017-06-13 18:32:20 -07:00
Stephen Birarda
f6f3087580 only broadcast replicated nodes to downstream 2017-06-13 18:11:50 -07:00
seefo
2d9e92d121 Made requested changes to PR10683 2017-06-13 18:08:26 -07:00
seefo
4080814df8 Cleaned up dropdown support for tables 2017-06-13 18:07:16 -07:00
seefo
2f307f418c Added support for dropdown to tables in domain settings 2017-06-13 18:07:16 -07:00
Stephen Birarda
29842c67cc use received message faking for cleaner replication in audio 2017-06-13 18:04:59 -07:00
seefo
74066647c6 Resolved FB4958 2017-06-13 18:01:53 -07:00
Ryan Huffman
a476a5b82e Change ReplicatedAvatarIdentity packet to be an unreliable packet 2017-06-13 17:19:58 -07:00
Ryan Huffman
0708daa6cc Add separate sendReplicatedIdentityPacket 2017-06-13 17:19:58 -07:00