Commit graph

28373 commits

Author SHA1 Message Date
Atlante45
c6f6dbd845 Fix QByteArray from rqw data 2015-07-16 09:59:15 -07:00
Atlante45
d8f4b08ecc Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 19:04:06 -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
Atlante45
e6d443f6f6 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 17:52:41 -07:00
Stephen Birarda
1752d5e7ca fix mix packet sample copy bug 2015-07-15 17:52:37 -07:00
Atlante45
9048c3fdc5 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 17:52:34 -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
Atlante45
f5ef94b6b3 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:47:24 -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
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
Stephen Birarda
6a02e6d001 resolve final conflict in Application 2015-07-15 16:23:23 -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
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
Atlante45
a39610da09 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 15:50:39 -07:00
Stephen Birarda
52fdce4a44 fix fromRawData call for silent audio packet 2015-07-15 15:41:45 -07:00
Atlante45
8aa2892fde Remove OctreePacketProcessor dtor 2015-07-15 15:35:13 -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
f45c62413f remove definition of OctreePacketProcessor dtor 2015-07-15 15:19:41 -07:00
Stephen Birarda
5a2a3009c2 don't double unregister in OctreePacketProcessor 2015-07-15 15:13:31 -07:00
Stephen Birarda
5a2d59c530 fix ScriptEngine cleanup for Agent 2015-07-15 15:07:34 -07:00
Brad Hefta-Gaub
7d8f2e906b Merge pull request #5340 from cozza13/20617
CR for Job #20617 - Change default Minimum Desktop FPS
2015-07-15 14:59:43 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect
Remove the glow effect.
2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub
ae6e7f05b6 Merge pull request #5341 from samcake/daft
Remove the glGet( viewport ) from DeferredLightingEffect
2015-07-15 14:26:08 -07:00
samcake
5e2fe8dbec Merge pull request #5333 from ZappoMan/removeNakeGL
Remove more naked GL
Tested
2015-07-15 14:19:05 -07:00
Atlante45
ebeeee62bf Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 14:07:06 -07:00
Atlante45
039bdc8900 Check dependencyManager return value 2015-07-15 14:06:39 -07:00
Stephen Birarda
3d02cfc6ad only print no listener for packet one time 2015-07-15 14:06:19 -07:00
Atlante45
057afa980e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 14:00:21 -07:00
Stephen Birarda
6c06d4c49e use fromRawData for writeDatagram, correct type for PingReply 2015-07-15 13:59:58 -07:00
Atlante45
b677f8de28 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:50:52 -07:00