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 |
|
Stephen Birarda
|
60ae02e4e9
|
some formatting changes in entities
|
2015-07-16 12:38:39 -07:00 |
|
Stephen Birarda
|
7a48463f4e
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-16 12:09:55 -07:00 |
|
Stephen Birarda
|
8921f59e23
|
fix entity packet send from interface client
|
2015-07-16 12:09:35 -07:00 |
|
Stephen Birarda
|
61f23f6a5e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
|
2015-07-16 11:56:26 -07:00 |
|
Stephen Birarda
|
336967e580
|
fix edit packet sending from client
|
2015-07-16 11:17:49 -07:00 |
|
Atlante45
|
bf637f8f18
|
Fix broadcast to nodes
|
2015-07-16 10:50:05 -07:00 |
|
Atlante45
|
ae8e79750b
|
Stop ping timer in handle node kill
|
2015-07-16 10:00:54 -07:00 |
|
Atlante45
|
8424e91ae1
|
Added sequence number to packets
|
2015-07-16 10:00:01 -07:00 |
|
Atlante45
|
c6f6dbd845
|
Fix QByteArray from rqw data
|
2015-07-16 09:59:15 -07:00 |
|
Stephen Birarda
|
039ef0750c
|
set jurisdiction listener object name for thread identification
|
2015-07-15 18:52:59 -07:00 |
|
Stephen Birarda
|
6fa17dafff
|
open packets for write with ReadWrite
|
2015-07-15 18:27:43 -07:00 |
|
Stephen Birarda
|
000232a55d
|
fix copied packet buffer creation
|
2015-07-15 17:59:37 -07:00 |
|
Stephen Birarda
|
863cc3390a
|
fix send of mixed audio stream packet from AM
|
2015-07-15 17:41:00 -07:00 |
|
Stephen Birarda
|
765e8cbb87
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-15 17:37:51 -07:00 |
|
Stephen Birarda
|
333cd77d9c
|
cleanup call to parseAudioData
|
2015-07-15 17:20:02 -07:00 |
|
samcake
|
b7ac84e174
|
Merge pull request #5342 from ZappoMan/removeNakeGL
remove some more dead code and naked gl
|
2015-07-15 17:07:55 -07:00 |
|
Stephen Birarda
|
9318f464a4
|
fix position of read in InboundAudioStream
|
2015-07-15 16:42:58 -07:00 |
|
Atlante45
|
6c98c23524
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:36:22 -07:00 |
|
ZappoMan
|
5165210e11
|
fix Sams comment about comments
|
2015-07-15 16:35:20 -07:00 |
|
Stephen Birarda
|
273e92f1fd
|
pass correct size for audio read
|
2015-07-15 16:34:00 -07:00 |
|
Atlante45
|
43e2961810
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:33:24 -07:00 |
|
Stephen Birarda
|
3cba3d0dcd
|
fix packet receiver cleanup
|
2015-07-15 16:33:12 -07:00 |
|
Atlante45
|
ce5bcb8de1
|
Check ptr
|
2015-07-15 16:33:04 -07:00 |
|
Atlante45
|
cb64b0353e
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:26:11 -07:00 |
|
Stephen Birarda
|
8f8845d78d
|
remove accidentally re-added PacketHeaders
|
2015-07-15 16:25:04 -07:00 |
|
Atlante45
|
a2644752a4
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:20:11 -07:00 |
|
Stephen Birarda
|
05dde9d8f5
|
resolve conflicts on merge with upstream/master
|
2015-07-15 16:18:47 -07:00 |
|
Stephen Birarda
|
00c1dce3e5
|
disconnect readyRead in LimitedNodeList dtor
|
2015-07-15 16:16:26 -07:00 |
|
Atlante45
|
2b27918953
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:10:51 -07:00 |
|
Stephen Birarda
|
dd4c2eaccd
|
add seek back for ping packet
|
2015-07-15 16:10:32 -07:00 |
|
Atlante45
|
644545b965
|
Seek to start of ping packet
|
2015-07-15 16:10:08 -07:00 |
|
Sam Gateau
|
9657d146f7
|
Clearing Model.cpp from naked gl call references
|
2015-07-15 16:09:53 -07:00 |
|
Atlante45
|
4db2a77f9f
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 15:58:28 -07:00 |
|
Atlante45
|
f065638748
|
Ping code cleanup
|
2015-07-15 15:58:14 -07:00 |
|
Stephen Birarda
|
97936c82f2
|
add a missing library link
|
2015-07-15 15:58:05 -07:00 |
|
Stephen Birarda
|
85a5d7059c
|
fix naming of variable in timePingReply
|
2015-07-15 15:56:31 -07:00 |
|
ZappoMan
|
d1e511efcb
|
more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl
|
2015-07-15 15:52:12 -07:00 |
|
Stephen Birarda
|
52fdce4a44
|
fix fromRawData call for silent audio packet
|
2015-07-15 15:41:45 -07:00 |
|
ZappoMan
|
2ad2c4d554
|
remove some dead code
|
2015-07-15 15:33:28 -07:00 |
|
Atlante45
|
725383e43a
|
Check ptr, not addr
|
2015-07-15 15:30:54 -07:00 |
|
Atlante45
|
8483b168be
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 15:26:34 -07:00 |
|
Atlante45
|
85391cefbb
|
Bug fixes
|
2015-07-15 15:26:22 -07:00 |
|
Stephen Birarda
|
5a2d59c530
|
fix ScriptEngine cleanup for Agent
|
2015-07-15 15:07:34 -07:00 |
|
samcake
|
de7aed1abc
|
Merge pull request #5338 from ZappoMan/removeGlowEffect
Remove the glow effect.
|
2015-07-15 14:50:15 -07:00 |
|
Stephen Birarda
|
3d02cfc6ad
|
only print no listener for packet one time
|
2015-07-15 14:06:19 -07:00 |
|
Stephen Birarda
|
6c06d4c49e
|
use fromRawData for writeDatagram, correct type for PingReply
|
2015-07-15 13:59:58 -07:00 |
|
Stephen Birarda
|
7207bdfe2b
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-15 13:50:40 -07:00 |
|
Stephen Birarda
|
7dfbb74d67
|
ping packets are verified packets
|
2015-07-15 13:49:34 -07:00 |
|