Stephen Birarda
|
dd30813ae0
|
remove an extra line in DomainServer
|
2015-07-09 12:39:43 -07:00 |
|
Stephen Birarda
|
f68845e806
|
remove hash and sequence number replacement in PacketHeaders
|
2015-07-09 12:33:34 -07:00 |
|
Stephen Birarda
|
3da1a81363
|
remove packet header population from PacketHeaders
|
2015-07-09 12:32:52 -07:00 |
|
Stephen Birarda
|
6dc7745826
|
remove two lines from PacketHeaders
|
2015-07-09 12:29:21 -07:00 |
|
Stephen Birarda
|
11a4c20a21
|
fix payloadSize write in DomainServer
|
2015-07-09 12:23:54 -07:00 |
|
Stephen Birarda
|
bcea400ee4
|
delete the old methods to get closer to an even PR
|
2015-07-09 12:23:12 -07:00 |
|
Stephen Birarda
|
01d1a17231
|
fix indentation in LimitedNodeList
|
2015-07-09 12:20:28 -07:00 |
|
Stephen Birarda
|
4c8f32ce7b
|
add an assert for an NLPacketList segment that is oversized
|
2015-07-09 12:13:15 -07:00 |
|
Stephen Birarda
|
cafa8b65f5
|
specify the size of the DTLS required packet
|
2015-07-09 12:07:18 -07:00 |
|
Stephen Birarda
|
adf2ce85f1
|
pack the size of the connection denied reason
|
2015-07-09 12:03:15 -07:00 |
|
Stephen Birarda
|
a38cb56c1c
|
fix an accidental comment add
|
2015-07-09 11:56:24 -07:00 |
|
Stephen Birarda
|
8e693bfee7
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-09 11:53:27 -07:00 |
|
Atlante45
|
94d2fce1dd
|
Fix sendNackPackets logic
|
2015-07-09 11:52:57 -07:00 |
|
Stephen Birarda
|
806862fae9
|
pass existing SharedNodePointer from EntityServer
|
2015-07-09 11:50:39 -07:00 |
|
Stephen Birarda
|
a363f42bb2
|
pass const NLPacket& for all sendUnreliablePacket calls
|
2015-07-09 11:42:18 -07:00 |
|
Atlante45
|
2d810e06dc
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-09 11:37:43 -07:00 |
|
Stephen Birarda
|
a49b985dad
|
fix call to packetSent from EntityServer
|
2015-07-09 11:37:20 -07:00 |
|
Atlante45
|
4d72e3d309
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-09 11:37:17 -07:00 |
|
Stephen Birarda
|
d3d3b84a20
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-09 11:36:21 -07:00 |
|
Stephen Birarda
|
83cc4380a7
|
fix for sentPacketHistory dequeue
|
2015-07-09 11:36:12 -07:00 |
|
Atlante45
|
60831d55c6
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-09 11:35:57 -07:00 |
|
Atlante45
|
cc0e0e6a1f
|
Compile fixes in assignment client
|
2015-07-09 11:35:36 -07:00 |
|
Stephen Birarda
|
7e07754773
|
fix octreePacketSent call with const NLPacket&
|
2015-07-09 11:35:12 -07:00 |
|
Stephen Birarda
|
c903d284bb
|
fix for arguments that are now const NLPacket&
|
2015-07-09 11:32:00 -07:00 |
|
Stephen Birarda
|
765265abd8
|
fix networking API calls in IceServer
|
2015-07-09 11:27:06 -07:00 |
|
Stephen Birarda
|
6d2fea4426
|
make NLPacket copy take const, fix get in SPH
|
2015-07-09 11:24:58 -07:00 |
|
Stephen Birarda
|
bd9b42bd4c
|
change createCopy in packet to take const &
|
2015-07-09 11:23:44 -07:00 |
|
Stephen Birarda
|
659f6742c6
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-09 11:21:36 -07:00 |
|
Stephen Birarda
|
922d6413d5
|
change some const unique_ptr to const NLPacket
|
2015-07-09 11:21:27 -07:00 |
|
Atlante45
|
297d38d4eb
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-09 11:20:25 -07:00 |
|
Atlante45
|
f2e0524817
|
Add send unreliable takes const ref
|
2015-07-09 11:20:01 -07:00 |
|
Atlante45
|
605b004514
|
Assigment client compile fixes
|
2015-07-09 11:19:36 -07:00 |
|
Stephen Birarda
|
885068bd6b
|
create billboard and identity packets of the right size
|
2015-07-09 11:15:45 -07:00 |
|
Stephen Birarda
|
6cf0018914
|
repairs required for domain-server build
|
2015-07-09 11:07:13 -07:00 |
|
Stephen Birarda
|
19c5f0b67c
|
resolve conflicts on merge with upstream/master
|
2015-07-08 22:54:36 -07:00 |
|
Stephen Birarda
|
8c2cf2cf25
|
fix an unused variable warning
|
2015-07-08 22:48:44 -07:00 |
|
Stephen Birarda
|
f2a198dfdd
|
add O_OBJECT macros to appropriate classes, fix PacketList errors
|
2015-07-08 22:46:43 -07:00 |
|
Brad Hefta-Gaub
|
02c3b63f45
|
Merge pull request #5282 from jherico/entity_parsing
Working on fixing entity item parsing
|
2015-07-08 21:02:23 -07:00 |
|
Brad Davis
|
b173ac397c
|
Merge pull request #5278 from samcake/yellow
Adding more NSight instrumentation
|
2015-07-08 20:28:18 -07:00 |
|
Stephen Birarda
|
302e502d84
|
remove NLPacket forward declare
|
2015-07-08 20:17:23 -07:00 |
|
Stephen Birarda
|
8935baf3aa
|
add missing return of new packet
|
2015-07-08 20:11:08 -07:00 |
|
Stephen Birarda
|
d3e48e1293
|
fix a missing templated type in PacketList
|
2015-07-08 20:08:25 -07:00 |
|
Atlante45
|
cb49d89369
|
Fix link errors
|
2015-07-08 19:56:07 -07:00 |
|
Atlante45
|
405e4f37ab
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-08 19:17:14 -07:00 |
|
Stephen Birarda
|
46e6f9cf4f
|
add a type for templated return
|
2015-07-08 19:15:40 -07:00 |
|
Atlante45
|
0b0361f6fd
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-08 19:15:22 -07:00 |
|
Stephen Birarda
|
0d1c4a4177
|
add classes to templated methods
|
2015-07-08 19:14:32 -07:00 |
|
Stephen Birarda
|
b08c0d3817
|
Merge remote-tracking branch 'clement/protocol' into atp
|
2015-07-08 19:13:27 -07:00 |
|
Atlante45
|
6b8414d364
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-08 19:13:25 -07:00 |
|
Atlante45
|
263e737137
|
Move template func body outside of class
|
2015-07-08 19:13:01 -07:00 |
|