Commit graph

28682 commits

Author SHA1 Message Date
Stephen Birarda
6d7b659dff remove the environment data process from header 2015-07-16 16:24:26 -07:00
Atlante45
bc6831f4d1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 16:24:08 -07:00
Stephen Birarda
eb0ed438ec remove environment data packet 2015-07-16 16:23:57 -07:00
Stephen Birarda
76592d1371 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-16 16:13:28 -07:00
Atlante45
a5a116fa90 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 16:13:24 -07:00
Stephen Birarda
b1be617481 add back MAX_PACKET_HEADER_BYTES 2015-07-16 16:12:01 -07:00
Atlante45
87111b54a7 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 16:10:05 -07:00
Stephen Birarda
1a85e95f71 remove implementation of packetTypeForPacket 2015-07-16 16:09:48 -07:00
Atlante45
9625e6b33a emove impl of deleted methods 2015-07-16 16:09:47 -07:00
Atlante45
d1c66751c4 emove unused method 2015-07-16 16:08:58 -07:00
Stephen Birarda
271575c832 remove unused octree method 2015-07-16 16:08:21 -07:00
Stephen Birarda
846506901a more removals from PacketHeaders 2015-07-16 16:06:56 -07:00
Stephen Birarda
1bb3e1789a remove more PacketHeader methods 2015-07-16 16:05:27 -07:00
Stephen Birarda
61653bd88d remove old PacketHeader methods 2015-07-16 16:04:12 -07:00
Stephen Birarda
648f9868f0 add back space in PacketHeaders 2015-07-16 15:58:34 -07:00
Stephen Birarda
83f98a3e57 remove line number comment for enum 2015-07-16 15:58:18 -07:00
Stephen Birarda
eb5fdd7214 clear unused types and push version to 10 2015-07-16 15:57:19 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
Stephen Birarda
a6641908fb check if audio mixer is alive before packet send 2015-07-16 15:49:15 -07:00
Stephen Birarda
c5047ec76d fix sequence number packing for audio injector 2015-07-16 15:47:25 -07:00
Ryan Huffman
c4526aa783 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 15:44:42 -07:00
Atlante45
b60e358a68 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 15:30:00 -07:00
Stephen Birarda
29f91267d9 repairs to nack packet receiving for entity-server 2015-07-16 15:29:50 -07:00
Atlante45
56886e479d Use BulkAvatarData packet type for AvatarMixer upstrea 2015-07-16 15:28:53 -07:00
Stephen Birarda
b1d240defd add extra debug to IceServer 2015-07-16 14:43:57 -07:00
Stephen Birarda
010cbd9934 don't handle octree query while server shutting down 2015-07-16 14:42:16 -07:00
Ryan Huffman
676e210791 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 14:31:51 -07:00
Stephen Birarda
d04c2e4a78 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-16 14:24:50 -07:00
Stephen Birarda
71f824bc6a Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-16 14:24:42 -07:00
Atlante45
7cb4afd718 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 14:22:40 -07:00
Stephen Birarda
f31675c4c6 fix ice-server packets 2015-07-16 14:21:37 -07:00
Atlante45
9a2f51c6de Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-16 14:12:19 -07:00
Ryan Huffman
b561014d77 Add head-lean reading back into AvatarData 2015-07-16 14:11:36 -07:00
Ryan Huffman
3429f0f57c Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 14:06:21 -07:00
Atlante45
60f44d8e6e Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-16 14:03:45 -07:00
Ryan Huffman
f8f47f99c6 Temporarily disable body lean in avatar 2015-07-16 14:03:36 -07:00
Atlante45
00fbff112f Process avatar data 2015-07-16 14:03:11 -07:00
Atlante45
a7754ad085 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:52:32 -07:00
Stephen Birarda
ed928e8a6b actual fix for AddressManager address with port 2015-07-16 13:52:18 -07:00
Atlante45
246b39a18a Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:42:08 -07:00
Stephen Birarda
5d84d2ec30 add port to current address if not default 2015-07-16 13:39:14 -07:00
ericrius1
66154d20e0 deleted unnessary log message 2015-07-16 13:38:39 -07:00
ericrius1
f7108ccff8 modified collision-hull model to not include the handle. This prevents the sword handle from pushing the brandishing avatar around, while still letting the sword sit in said avatar's hand in a more aesthetically pleasing manner than floating off in space 2015-07-16 13:27:59 -07:00
Stephen Birarda
76d47eb4e7 mark the DataServerConfirm packet unused 2015-07-16 13:22:18 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Stephen Birarda
05dd49a4c5 seek back after track of octree packet 2015-07-16 13:02:20 -07:00
Sam Gateau
50a521e1f2 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-16 12:38:47 -07:00
Stephen Birarda
60ae02e4e9 some formatting changes in entities 2015-07-16 12:38:39 -07:00
Sam Gateau
4ca333efe1 Adding the scissor rect in the Batch and a way to enable the scissor test locally for clear commands 2015-07-16 12:38:11 -07:00
bwent
854a098180 keep track of channel id's within addChannel function, pass in when updating 2015-07-16 12:28:43 -07:00