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
John Grosen
f0cb49ef5c
added space between expressions in ternary operator
2014-06-12 17:24:56 -07:00
John Grosen
8e74398ed7
Fixed command line args parsing bug
2014-06-12 17:06:59 -07: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
AndrewMeadows
49a33ff46a
Merge pull request #3006 from ey6es/metavoxels
...
Streaming/delta-streaming for script values.
2014-06-11 09:25:39 -07:00
wangyix
c6a9a8924d
changed NetworkPacket::_sendingNode to ::_node
2014-06-10 16:43:53 -07:00
ZappoMan
0ae7411bf0
fix some bugs in models
2014-06-10 13:37: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
Andrzej Kapolka
3293ab788b
Fix for script object deltas.
2014-06-09 17:19:36 -07:00
Andrzej Kapolka
590f045ed1
Script value streaming tests, fixes.
2014-06-09 16:51:41 -07:00
Andrzej Kapolka
7bf8fd155d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-09 14:35:39 -07:00
Andrzej Kapolka
fd469c543c
More script streaming bits.
2014-06-09 14:35:20 -07:00
Stephen Birarda
ee71d34f02
add a crash guard around negative silent samples
2014-06-09 14:03:47 -07: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
32cf08ce65
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-09 11:55:30 -07:00
Andrzej Kapolka
28490f9bbc
Merge pull request #2994 from AndrewMeadows/ragdoll
...
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
2014-06-09 11:55:19 -07:00
Andrzej Kapolka
58bd1f7ab5
More script streaming bits.
2014-06-09 11:54:43 -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
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
Andrzej Kapolka
a1e208ae3d
Simplification. If the normal is zero, then the cross product will also be
...
zero, so we can just have the one check and postpone normalization until
afterwards.
2014-06-09 11:03:50 -07:00
Andrzej Kapolka
6eac0ee2ae
Avoid crash on zero-length normals.
2014-06-09 10:58:56 -07:00
Andrzej Kapolka
ae22aa1a21
Working on JS type streaming.
2014-06-09 10:53:44 -07:00
Andrzej Kapolka
4d423c679c
Added some typedefs to simplify the various mapping types.
2014-06-09 10:21:55 -07:00
Andrzej Kapolka
45c35d3a68
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-09 10:05:09 -07:00
AndrewMeadows
5ed1dfc4b0
Merge pull request #2999 from ey6es/metavoxels
...
Provide a way to stream enums that aren't object properties, added tests for delta streaming, fixed Windows initialization bug.
2014-06-09 08:48:20 -07:00
Brad Hefta-Gaub
8f71335bec
Merge pull request #2993 from Atlante45/temp_branch
...
More editModels.js work
2014-06-07 09:17:30 -07:00
Andrzej Kapolka
e620518d2f
Working on streaming script values.
2014-06-06 17:59:30 -07: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
Andrzej Kapolka
384fe51937
If we're going to initialize one mapping lazily, we might as well initialize
...
some more that way.
2014-06-06 16:38:52 -07:00
Andrzej Kapolka
2fec0a9db6
Fixes for Windows.
2014-06-06 15:50:28 -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
wangyix
5c47485562
client-side nack sending complete; ready to test
2014-06-06 14:27:51 -07:00
Andrzej Kapolka
73723e598f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-06 11:51:09 -07:00
Stephen Birarda
6fdc5df47b
bump silent audio frame version
2014-06-06 11:50:36 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
Andrzej Kapolka
4fbd0823f0
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-06 11:49:51 -07:00
