Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 12:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14439 commits 25 branches 0 tags 1.1 GiB
Commit graph

4250 commits

Author SHA1 Message Date
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
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
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
Atlante45
6e02561d96 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 14:08:57 -07:00
Atlante45
bf520d0eff Added thread safe implementation of NetworkAccessManager main methods 2014-07-02 14:05:46 -07:00
Atlante45
598c1cb516 Switched Sound to NetworkAccessManager 2014-07-02 11:27:55 -07:00
Atlante45
74e7e0a7bf Switched XMLHttpRequestClass to NetworkAccessManager 2014-07-02 11:27:32 -07:00
Andrew Meadows
f5debdb930 merge upstream/master into andrew/bispinor 2014-07-02 11:23:42 -07:00
Atlante45
2549b0d946 Switched ScriptEngine to NetworkAccessManager 2014-07-02 11:22:44 -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
Andrew Meadows
ec80ccdb9c remove warning about signed/unsigned comparison 2014-07-02 10:49:05 -07:00
Andrew Meadows
8b3af0b9cb merge upstream/master into andrew/say-no-to-warnings 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	libraries/audio/src/AudioRingBuffer.cpp
 2014-07-02 10:37:30 -07:00
Stephen Birarda
55d8b763c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 09:42:32 -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
30644c750d Switched AvatarData to NetworkAccessManager 2014-07-01 17:46:23 -07:00
wangyix
ab503583dd switched order of args in PositionalAudioRingBuffer 2014-07-01 17:33:38 -07:00
Atlante45
29976d7861 Created base for wrapper singleton class NetworkAccessManager 2014-07-01 17:17:34 -07:00
wangyix
a5943e3608 made AudioRingBuffer frames capacity variable 2014-07-01 16:24:31 -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
Stephen Birarda
f389e3a6da resolve conflicts on merge with upstream master 2014-07-01 11:02:25 -07:00
Brad Hefta-Gaub
df51d26625 Merge pull request #3094 from wangyix/seqNumberStats 
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
 2014-07-01 10:54:35 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
Andrew Meadows
5934ee5b22 added tests for ConeRollerConstraint 2014-07-01 09:35:47 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Andrew Meadows
9ca1bfdfe5 add AngularConstraint.* with some unit tests 
more unit tests to follow
 2014-06-30 18:05:22 -07:00