Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 13:07:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15498 commits 25 branches 0 tags 1.1 GiB
Commit graph

228 commits

Author SHA1 Message Date
wangyix
059628c26a fixed bug in SequenceNumberStats and its unit test; test passes now 2014-07-03 10:37:09 -07:00
Brad Hefta-Gaub
1b29b7c120 Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback 
Removed json callback
 2014-07-02 21:45:19 -07:00
Atlante45
1815472c6b Modified recently added case to AccountManager 2014-07-02 16:12:39 -07:00
Atlante45
106e5b578b Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 16:06:41 -07:00
Atlante45
90a27bb118 Removed json callback 2014-07-02 15:18:56 -07:00
Atlante45
84ea9833bb Added forgotten sendCustomRequest Method + comments 2014-07-02 14:30:40 -07:00
Atlante45
bf520d0eff Added thread safe implementation of NetworkAccessManager main methods 2014-07-02 14:05:46 -07:00
Atlante45
15b37ec3d1 Switched ResourceCache to NetworkAccessManager 2014-07-02 11:21:07 -07:00
Ryan Huffman
70121357be Update JSONCallbackParameters to take params in constructor 2014-07-02 11:12:06 -07:00
Ryan Huffman
ccc638d8c1 Merge branch 'master' of git://github.com/highfidelity/hifi into 19800 2014-07-01 20:03:54 -07:00
Atlante45
7c3292a41b Switched AccountManager to NetworkAccessManager 2014-07-01 17:47:31 -07:00
Atlante45
29976d7861 Created base for wrapper singleton class NetworkAccessManager 2014-07-01 17:17:34 -07:00
Atlante45
e9826250cb CR 2014-07-01 12:57:39 -07:00
Atlante45
958367f579 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 
Conflicts:
	interface/src/devices/OculusManager.cpp
 2014-07-01 12:45:42 -07:00
wangyix
fd051310da prune missing set before constructing nack packets; 
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
 2014-07-01 12:01:51 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Atlante45
d4ed9d4573 Removed preprocessor statements 2014-06-30 17:52:05 -07:00
Atlante45
780e669fbb fix for jenkins failure 2014-06-30 17:46:19 -07:00
Atlante45
d102795314 Added application version to logger 2014-06-30 17:18:49 -07:00
Atlante45
f33ad8a100 Adding logger calls 2014-06-30 17:10:17 -07:00
Atlante45
5e2ad7173c Added functions to logger 2014-06-30 14:27:53 -07:00
Atlante45
0d18debd1b Moved UserActivityLogger to networking 2014-06-30 14:27:07 -07:00
wangyix
0ae58bd7f9 added senderUUID arg to seq stats 2014-06-27 15:39:11 -07:00
wangyix
cb48825561 added seq number to all Audio types, untested 2014-06-26 16:52:23 -07:00
Ryan Huffman
50e77be406 Add DELETE to AccountManager 2014-06-26 16:07:02 -07:00
wangyix
2ec04fb756 replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
wangyix
b220b092f4 added SequenceNumberStats and unit test 2014-06-25 16:35:08 -07:00
wangyix
c583f8b023 removed unnecessary changes 2014-06-25 11:48:32 -07:00
wangyix
591bfa14b9 added PacketTypeAudioStreamStats for j-buffer stats 
...instead of packing that info into audio packets.
 2014-06-25 11:38:56 -07:00
wangyix
a4f5ce2215 added stats for audiomixer jitter buffers lengths in Application 2014-06-23 17:48:57 -07:00
Brad Hefta-Gaub
c49ff59725 Merge pull request #3037 from wangyix/edit_nack_pull 
Edit nack pull
 2014-06-18 11:43:25 -07:00
wangyix
54f32d331e replaced UINT16_MAX with std::numeric_limits<uint16_t>::max 2014-06-18 10:20:19 -07:00
wangyix
8c4e365958 added forgotten i++ in sendNackPackets() 
plus minor style fixes
 2014-06-18 09:28:42 -07:00
Brad Hefta-Gaub
cee6f1be6a Merge pull request #3031 from stojce/19755 
Code Review for Job #19755
 2014-06-17 17:28:55 -07:00
wangyix
5f62b43ba6 added edit nack types to non-verified list 2014-06-17 12:14:44 -07:00
wangyix
011e7c2de2 removed debug code 2014-06-17 11:53:09 -07:00
wangyix
8187912384 added qDebug() check in SentPacketHistory for seq numbers 
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
 2014-06-17 11:34:35 -07:00
Thijs Wenker
1e200c3b9c The balance display didn't get over ~21.1 because the parsed json object int32 is maximal 2147483647, fixed this by parsing it from json to double. 2014-06-17 19:49:35 +02:00
wangyix
dc71f87ea4 edit nacks seem to be working; 
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
 2014-06-17 10:42:56 -07:00
wangyix
06f8464ec9 edit nacks ready for test; seq numbers sometimes repeat?? 2014-06-16 17:17:48 -07:00
wangyix
18a9d74b88 changed OctreeEditPacketSender to queue packets for resend as nack is parsed 2014-06-16 16:35:30 -07:00
wangyix
5e37704772 SentPacketHistory now handles rollover 
updated SentPacketHistory path in comments
 2014-06-16 15:59:38 -07:00
wangyix
69c2a2d12b moved SentPacketHistory to libraries/networking/src 2014-06-16 14:04:21 -07:00
wangyix
ebfd65dea8 added OctreeInboundPacketProcessor::process() override to send nack periodically 
added code to remove dead nodes' stats in sendNackPackets()
 2014-06-16 12:30:16 -07:00
wangyix
2b20720f51 added sendNackPackets() to OctreeInboundPacketProcessor 
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
 2014-06-16 09:57:05 -07:00
Stojce Slavkovski
f1e008853c Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-15 12:36:14 +02:00
John Grosen
1a3de1ef28 Totally removed DataServerAccountInfo's JSON constructor 2014-06-13 15:01:20 -07:00
John Grosen
3af4e32c81 Now determines hasProfile from presence of username 2014-06-13 11:08:38 -07:00
wangyix
3d4fae4b3f Revert "added code for AC to send nack packets; no locking yet" 
This reverts commit 15bd0878c4.
 2014-06-13 09:58:56 -07:00
John Grosen
14f56310f6 Changed AccountManager to only rely on a proper OAuth response. 
This involved making another request after the initial OAuth authorization.
Because of this now-two-step process, some methods and signals were renamed
to make their purpose more clear. Additionally, a _hasProfile member variable
was added to DataServerAccountInfo in order to allow for knowledge of whether
the profile elements had been fetched when being deserialized from disk.
Error handling for the whole process is still nonexistant.
 2014-06-12 23:28:43 -07:00
Stojce Slavkovski
1959768513 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-13 00:45:06 +02:00
Stephen Birarda
d689c6b39f fix reference to attribute in STUN packet 2014-06-12 13:15:54 -07:00
wangyix
15bd0878c4 added code for AC to send nack packets; no locking yet 2014-06-12 11:37:05 -07:00
wangyix
7aef5edb8f removed debug var 2014-06-11 15:27:24 -07:00
wangyix
0601c24b24 removed debug prints 2014-06-11 15:26:22 -07:00
wangyix
ac0b037f0f removed connect(); put call into Application::nodeKilled 
OctreePacketReceiver::nodeKilled() doesn't get called when
NodeList::nodeKilled() is emitted for some unknown reason
 2014-06-11 15:25:00 -07:00
wangyix
2080cc3dee removed debug variable 2014-06-11 11:59:15 -07:00
wangyix
decd6109fb made nodeKilled signatures match 2014-06-11 11:57:54 -07:00
wangyix
760627003f killNode() to nodeKilled() 2014-06-11 11:11:04 -07:00
wangyix
fc07ceb412 added killNode() slot for _packetCounts garbage collection 2014-06-11 10:54:44 -07:00
wangyix
01005dc792 Merge remote-tracking branch 'upstream/master' 2014-06-11 10:09:49 -07:00
wangyix
c6a9a8924d changed NetworkPacket::_sendingNode to ::_node 2014-06-10 16:43:53 -07:00
wangyix
b96b6c9857 added default constructor for NetworkPacket 
updated param comments in ReceivedPacketProcessor
 2014-06-10 12:24:47 -07:00
wangyix
d84beee3e4 VoxelPacketProcessor -> OctreePacketProcessor 
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
 2014-06-10 11:05:51 -07:00
Stojce Slavkovski
3a6cbc257c Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-10 00:08:28 +02:00
Brad Hefta-Gaub
6cf30cf9d1 Merge pull request #3002 from wangyix/master 
added code to nack and re-send dropped octree data packets
 2014-06-09 13:52:21 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
529dd827a2 moved around code in sendNack() a bit 2014-06-09 12:00:19 -07:00
Andrzej Kapolka
e936697cf0 Merge pull request #2987 from leechfarm/master 
Fix for users with some special characters in their password not being able to log in
 2014-06-09 11:31:30 -07:00
Stojce Slavkovski
939f8c49de return balance in satoshis 2014-06-08 15:55:16 +02:00
wangyix
b39559d860 packet recovery seems to be working 
Seems to impact FPS a lot.  OctreeSceneStats is not being locked (causes
freezing, need to find out why).
 2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff Merge remote-tracking branch 'upstream/master' into packet_recovery_pull 2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c added random packet drops; ready to test 2014-06-06 15:03:54 -07:00
Stephen Birarda
6fdc5df47b bump silent audio frame version 2014-06-06 11:50:36 -07:00
Stephen Birarda
b6b148cd9f resolve conflicts on merge with upstream master 2014-06-06 11:31:16 -07:00
Stephen Birarda
7da091d2b4 initial hooks for stereo audio 2014-06-06 10:15:09 -07:00
wangyix
1a7e3a859c started work on resending nacked packets 2014-06-05 18:00:58 -07:00
Joseph Gilley
c1d1a8de5c Fix for users with some special characters in their password not being able to log in using the login overlay in the Interface. 2014-06-05 00:26:45 -04:00
wangyix
ebfc405d9d more cleanup 3 2014-06-04 11:55:20 -07:00
wangyix
480efcbe76 more cleanup again 2014-06-04 11:31:44 -07:00
wangyix
25e2f28b02 more cleanup 2014-06-04 11:30:35 -07:00
wangyix
b452d08495 cleaned up debug statements 
also reorganized MovingPercentile a little bit
 2014-06-04 11:20:29 -07:00
wangyix
12ac6105f1 changed MovingMedian to MovingPercentile 2014-06-04 10:59:32 -07:00
wangyix
50746a6540 extra commit of previous commit? 2014-06-03 16:19:12 -07:00
wangyix
c851edd0ef added MovingMedian class, but not using it 
added packet type/time data collection to DatagramProcessor and
post-execution prints of that info.
 2014-06-03 16:18:40 -07:00
wangyix
65508b2016 updated packet type version numbers 2014-05-29 11:42:35 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
wangyix
a0f9d2c106 Merge remote-tracking branch 'upstream/master' 2014-05-29 09:20:30 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
wangyix
e89d33dc60 added if to not track ParticleErase packets 2014-05-27 18:02:49 -07:00
Stephen Birarda
9df0f2c1e5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887 fix credit amount in window title 2014-05-23 17:37:36 -07:00
Stephen Birarda
1b00cda068 don't use powf for credit conversions 2014-05-23 16:12:34 -07:00
Stephen Birarda
34eb0f9f43 make transaction amounts and balances signed 64-bit 2014-05-23 15:34:34 -07:00
Stephen Birarda
9acf377573 balances are 64-bit unsigned ints 2014-05-23 11:52:39 -07:00
Stephen Birarda
4f81bac742 add back a missing space in AccountManager 2014-05-22 17:16:42 -07:00
Stephen Birarda
164d3c5fb3 make sure balance is cleared on logout and re-launch 2014-05-22 15:06:16 -07:00
Stephen Birarda
79f09605d5 show credit balance in window title 2014-05-22 14:55:43 -07:00
Stephen Birarda
01e8d775f2 change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00