Commit graph

28521 commits

Author SHA1 Message Date
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Stephen Birarda
ad63be4efc Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:40:03 -07:00
Atlante45
e3f7c33767 Fix index check in setJointRotation 2015-07-17 15:39:25 -07:00
Stephen Birarda
dbc19cb467 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:39:20 -07:00
Atlante45
d505527e5a Remove setExtendedheader call 2015-07-17 15:38:36 -07:00
Atlante45
c97c2f0ed0 Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-17 15:32:45 -07:00
Stephen Birarda
59e14dfd65 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 15:32:09 -07:00
Stephen Birarda
34617f0391 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:28:01 -07:00
Stephen Birarda
9a4cc1308d fix packet list segment break 2015-07-17 15:27:57 -07:00
Ryan Huffman
1e7691941c Add raw data read to Packet 2015-07-17 15:27:29 -07:00
Atlante45
3f4041595a Fix compile error in connect 2015-07-17 15:26:04 -07:00
Atlante45
cbf7f7c2e1 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-17 15:16:21 -07:00
Stephen Birarda
8447046636 Merge pull request #7 from birarda/atp
repairs for new networking code
2015-07-17 15:07:58 -07:00
Stephen Birarda
fe0cdc0529 put AvatarHashMap slots back to private 2015-07-17 14:35:38 -07:00
Stephen Birarda
8ff8a17f02 remove TODO added for DS, check sockets 2015-07-17 14:17:48 -07:00
Stephen Birarda
8a2bb55231 add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
Stephen Birarda
08bd2adb51 remove dead listeners from set of directly connected objects 2015-07-17 13:58:14 -07:00
Stephen Birarda
1c98c5e02c remove unregisterListener that isn't needed anymore 2015-07-17 11:20:05 -07:00
Stephen Birarda
7a13c867ae quit the ScriptEngine thread once the script is done 2015-07-17 11:18:14 -07:00
Stephen Birarda
eaeaa23f03 resolve conflicts on merge with origin/protocol 2015-07-17 11:10:30 -07:00
Stephen Birarda
33f42bec78 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 11:07:17 -07:00
Atlante45
fec6b6b0bb Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-17 11:07:13 -07:00
Stephen Birarda
eb80922325 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 11:07:10 -07:00
Stephen Birarda
357963b6e0 fix reference to packet that is now buffer 2015-07-17 11:06:39 -07:00
Atlante45
6da9825bac Include stdlib string instead of cstring 2015-07-17 11:06:23 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Ryan Huffman
9725184b24 Move dataSent signal from PacketReceiver to LimitedNodeList 2015-07-17 11:05:07 -07:00
Atlante45
fbaf25f3f9 Remove unused header 2015-07-17 11:04:54 -07:00
Atlante45
cf453952f4 Rename should nack 2015-07-17 10:52:27 -07:00
Atlante45
7487f708b9 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-17 10:49:40 -07:00
Stephen Birarda
0811553c41 add a direct registration for EntityEditPacketSender 2015-07-17 10:49:24 -07:00
Ryan Huffman
68564a79b0 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-17 09:59:05 -07:00
Atlante45
7f9d6dafce Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-17 09:56:41 -07:00
Stephen Birarda
2d5428276a shouldNack default to true 2015-07-17 09:56:27 -07:00
Ryan Huffman
988fc79126 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-17 09:55:50 -07:00
Atlante45
bc1569be6b Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-17 09:32:44 -07:00
Stephen Birarda
9466d5eca5 add the stop node packet to list of non sourced 2015-07-17 09:29:59 -07:00
Stephen Birarda
7d2495e289 set the generic thread priority once it's actually started 2015-07-17 09:24:00 -07:00
Stephen Birarda
97312f9898 remove dead listener from map right before invoke 2015-07-17 09:21:10 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Stephen Birarda
e7249594e1 unregister the AvatarHashMap packet registrations 2015-07-16 17:55:29 -07:00
Stephen Birarda
040c7557da fix double register for Agent avatar packets 2015-07-16 17:51:06 -07:00
Stephen Birarda
49f5a5ffcb remove double declaration of PacketReceiver 2015-07-16 17:46:46 -07:00
Atlante45
b1821fc686 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 17:45:00 -07:00
Stephen Birarda
ce6585ccc8 fix AC monitor and AM double register 2015-07-16 17:44:43 -07:00
Atlante45
fb67dd9858 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 17:30:43 -07:00
Stephen Birarda
e8de73427b fix suppression of hash mismatch messages 2015-07-16 17:25:55 -07:00
Stephen Birarda
b257daaef1 fix supression of repeated messages for version mismatch 2015-07-16 17:23:00 -07:00
Atlante45
95f0dfbc43 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 17:09:22 -07:00
Stephen Birarda
2a2eb39066 repairs for DS path query and response 2015-07-16 17:08:06 -07:00