Commit graph

14869 commits

Author SHA1 Message Date
ZappoMan
a53d007c33 add support for getting current animation details for running avatar animations 2014-07-03 11:59:18 -07:00
Stephen Birarda
6665a9427a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 11:39:40 -07:00
Andrzej Kapolka
2bffff3275 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-03 11:39:27 -07:00
Clément Brisset
6109b7201a Merge pull request #3120 from birarda/network-fix
make sure NetworkAccessManager singleton is on main AC thread
2014-07-03 11:35:36 -07:00
Stephen Birarda
411733feb7 make sure NetworkAccessManager singleton is on main AC thread 2014-07-03 11:34:39 -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
ef9bb85f8a fix so domain-server doesn't open missing config file 2014-07-03 11:16:01 -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
0235b62324 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff 2014-07-03 11:05:20 -07:00
Stephen Birarda
fe52787572 implement a new rolloff function 2014-07-03 11:05:12 -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
Brad Hefta-Gaub
42fc98161b Merge pull request #3118 from Atlante45/replace_qnetworkaccessmanager
Replace qnetworkaccessmanager
2014-07-03 10:38:45 -07:00
wangyix
059628c26a fixed bug in SequenceNumberStats and its unit test; test passes now 2014-07-03 10:37:09 -07:00
Atlante45
6b88724578 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-03 10:30:39 -07:00
Atlante45
20cdc0e3ca Fix wrong slot names in ModelBrowser 2014-07-03 10:30:21 -07:00
Philip Rosedale
9be7a69e7a Merge pull request #3117 from AndrewMeadows/ragdoll
apply joint constraints during IK
2014-07-03 09:51:01 -07:00
Brad Hefta-Gaub
d0478384ae Merge pull request #3116 from ctrlaltdavid/19829
Code Review for Job #19829
2014-07-03 09:37:04 -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
55dd2a4835 re-enable gravity effect on arm IK 2014-07-03 09:10:23 -07:00
Andrew Meadows
356a29c2fb add AngularConstraint::softClamp() for hands 2014-07-03 08:40:34 -07:00
Brad Hefta-Gaub
67910a5ba2 Merge pull request #3115 from Barnold1953/OculusSDK
3DTV UI overlay + Oculus fixes
2014-07-02 21:45: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
Brad Hefta-Gaub
da87ac4105 Merge pull request #3112 from Atlante45/replace_qnetworkaccessmanager
Replace QNetworkAccessManager by Wrapper
2014-07-02 21:41:08 -07:00
Andrzej Kapolka
282c62a083 Handle LODs correctly (?) for reliable deltas. 2014-07-02 18:49:40 -07:00
Atlante45
69533c25c2 Fix script not being loaded at startup 2014-07-02 17:54:21 -07:00
Philip Rosedale
257dc56168 Merge pull request #3111 from noirsoft/master
Implementing improved perlin noise
2014-07-02 17:20:10 -07:00
barnold1953
b6a626c928 Removed comment 2014-07-02 17:18:12 -07:00
Andrzej Kapolka
154eb04336 Working on sending large deltas as reliable messages. 2014-07-02 17:13:39 -07:00
barnold1953
edcf4d04f8 Fixed bug when switching from normal view to oculus 2014-07-02 17:05:06 -07:00
barnold1953
ee30a446e9 Fixed 3rd person camera for non oculus 2014-07-02 16:45:05 -07:00
barnold1953
a859094d4a Clickable 3D UI in 3DTV 2014-07-02 16:40:02 -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
Philip Rosedale
1a3becc123 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-02 15:26:19 -07:00
Philip Rosedale
ec1f909210 Merge pull request #3109 from AndrewMeadows/ragdoll
stable arm IK without constraints
2014-07-02 15:26:10 -07:00
Atlante45
90a27bb118 Removed json callback 2014-07-02 15:18:56 -07:00
Stephen Birarda
73312ecc5f add the PitchWheel constant to the MIDIManager class 2014-07-02 15:07:49 -07:00
Atlante45
1ac38c9884 Switched call to setCache to invokeMethod 2014-07-02 14:31:19 -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