Andrew Meadows
|
63bcee0229
|
fix whitespace formatting
|
2014-07-09 14:33:09 -07:00 |
|
Andrew Meadows
|
3d6752ad90
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/Application.cpp
|
2014-07-09 12:52:00 -07:00 |
|
Andrew Meadows
|
d26585728b
|
Improved stat accumulation and context names
|
2014-07-09 11:53:53 -07:00 |
|
Andrew Meadows
|
d214998d1a
|
enforce coding standard: explicit casts
|
2014-07-09 11:53:09 -07:00 |
|
Philip Rosedale
|
32eb51a224
|
Merge pull request #3141 from ey6es/metavoxels
Fixes, congestion control for metavoxel streaming.
|
2014-07-08 21:30:13 -07:00 |
|
Andrzej Kapolka
|
2dbe72a818
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-08 16:49:14 -07:00 |
|
David Rowe
|
bc785115a9
|
Fix script errors not being reported
Script.update event needs to be emitted after reporting any script errors.
|
2014-07-08 16:33:31 -07:00 |
|
Andrzej Kapolka
|
1b890a9e48
|
Use congestion control for client sends, too.
|
2014-07-08 15:37:59 -07:00 |
|
Andrzej Kapolka
|
b6570dc4ee
|
Use congestion control on server.
|
2014-07-08 15:10:05 -07:00 |
|
Andrzej Kapolka
|
02cf1f006e
|
Change tests to reflect transmission changes and fixed issue with reprocessing
already-handled reliable delta.
|
2014-07-08 13:41:42 -07:00 |
|
wangyix
|
2e73ac8bc1
|
changed Audio.cpp to not overflow _audioOutput buffer, and 2 other things
added _consecutiveNotMixedCount to prevent premature injector stream
deletion; made silent-frame drop only occur in dynamic jitter buffer
mode
|
2014-07-08 11:16:39 -07:00 |
|
Andrzej Kapolka
|
db1a9fa09b
|
Fix for streaming error.
|
2014-07-08 10:14:41 -07:00 |
|
Andrzej Kapolka
|
365bc2a93e
|
Need to reset the stream here.
|
2014-07-07 19:27:04 -07:00 |
|
Andrzej Kapolka
|
aaae07087c
|
Fix for local edits.
|
2014-07-07 18:09:50 -07:00 |
|
Andrzej Kapolka
|
69e7a17f47
|
Rather than backing out when we find that the delta is too big, we can just
write the whole thing and copy it over (with some mapping fiddlery) if it
turns out to be too big.
|
2014-07-07 16:07:04 -07:00 |
|
Andrzej Kapolka
|
44befbb019
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-07 12:21:56 -07:00 |
|
Atlante45
|
8382f764cd
|
Got rid of unneccessary Q_DISABLE_COPY()
|
2014-07-07 12:15:55 -07:00 |
|
Atlante45
|
982a50dbcf
|
Remove multithread access from NetworkAccessManager for the time being
|
2014-07-07 11:33:54 -07:00 |
|
Andrzej Kapolka
|
fb64d22171
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-07 11:09:17 -07:00 |
|
Andrzej Kapolka
|
e15f003639
|
Bring reliable delta streaming code over from test.
|
2014-07-07 11:08:43 -07:00 |
|
Atlante45
|
b0e83c32ff
|
Hopeful fix to ACs crash
|
2014-07-03 18:17:01 -07:00 |
|
Andrzej Kapolka
|
da32c6e89b
|
Push persistent mappings into reliable delta channel before sending and pull
transient mappings out after sending.
|
2014-07-03 17:29:10 -07:00 |
|
Atlante45
|
8e1b8334a1
|
Fixed invokeMethod unable to find method + fixed children in different thread
|
2014-07-03 14:46:17 -07:00 |
|
Clément Brisset
|
4798cad1e5
|
Merge pull request #3121 from ZappoMan/animationFrameIndex
adds JavaScript API for getting the current animationDetails (state) for avatar animations
|
2014-07-03 13:45:27 -07:00 |
|
Brad Hefta-Gaub
|
b8071d8050
|
Merge pull request #3113 from birarda/master
initial pass at MIDI input for scripting
|
2014-07-03 13:40:25 -07:00 |
|
ZappoMan
|
8755e2d42e
|
CR feedback
|
2014-07-03 13:38:52 -07:00 |
|
Brad Hefta-Gaub
|
dbdce32b68
|
Merge pull request #3107 from wangyix/master
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
|
2014-07-03 13:32:31 -07:00 |
|
ZappoMan
|
a53d007c33
|
add support for getting current animation details for running avatar animations
|
2014-07-03 11:59:18 -07:00 |
|
wangyix
|
2c6b2000b2
|
forgot arg in AudioRingBuffer constructor in PositionalAudioRingBUffer
changed _currentJitterBufferFrames to be -1 to indicate starved.
|
2014-07-03 11:34:16 -07:00 |
|
Andrzej Kapolka
|
38383effcc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-03 11:33:22 -07:00 |
|
Stephen Birarda
|
6038c33fe6
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-07-03 11:12:19 -07:00 |
|
wangyix
|
507518f16d
|
removed numFramesCapacity from being exposed everywhere
|
2014-07-03 11:11:56 -07:00 |
|
Stephen Birarda
|
9734446e23
|
Merge pull request #3119 from birarda/the-voices-inside
fix for script agent audio missing channel flag
|
2014-07-03 11:04:51 -07:00 |
|
Stephen Birarda
|
0a3a8b0693
|
remove space at the top of the ScriptEngine file
|
2014-07-03 10:45:43 -07:00 |
|
Stephen Birarda
|
0af79c4d95
|
fix for script agent audio missing channel flag
|
2014-07-03 10:45:05 -07:00 |
|
wangyix
|
a2451a9651
|
moved and updated a comment in SequenceNumberStats
|
2014-07-03 10:41:54 -07:00 |
|
wangyix
|
059628c26a
|
fixed bug in SequenceNumberStats and its unit test; test passes now
|
2014-07-03 10:37:09 -07:00 |
|
Andrew Meadows
|
8c8a29f477
|
merge upstream/master into andrew/ragdoll
|
2014-07-03 09:27:52 -07:00 |
|
Stephen Birarda
|
f1e2ba1267
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-07-03 09:25:03 -07:00 |
|
Andrew Meadows
|
356a29c2fb
|
add AngularConstraint::softClamp() for hands
|
2014-07-03 08:40:34 -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 |
|
Andrzej Kapolka
|
282c62a083
|
Handle LODs correctly (?) for reliable deltas.
|
2014-07-02 18:49:40 -07:00 |
|
Andrzej Kapolka
|
154eb04336
|
Working on sending large deltas as reliable messages.
|
2014-07-02 17:13:39 -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
|
45db5e2c40
|
Removed Xcode warnings
|
2014-07-02 15:57:11 -07:00 |
|
Clément Brisset
|
1f92d57230
|
Merge pull request #3103 from AlericInglewood/19827
Code Review for Job #19827
|
2014-07-02 15:53:57 -07:00 |
|
Clément Brisset
|
ae6b4def32
|
Merge pull request #3108 from huffman/19800
Code Review for Job #19800
|
2014-07-02 15:46:56 -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 |
|