Brad Hefta-Gaub
cee6f1be6a
Merge pull request #3031 from stojce/19755
...
Code Review for Job #19755
2014-06-17 17:28:55 -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
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
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
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
