Philip Rosedale
f8185dec75
removed some debug logs
2014-07-08 22:26:11 -07:00
Philip Rosedale
c50d9ae3e4
Hand low velocity filter as a menu option
2014-07-08 22:22:27 -07:00
Andrzej Kapolka
e579be82a2
Merge pull request #3137 from PhilipRosedale/master
...
Better clapping and hand squeezing scripts, started new hair class to hold vertlet hair
2014-07-08 14:20:03 -07:00
Andrzej Kapolka
7163db7586
Merge pull request #3136 from birarda/master
...
use compiler default C++ standard library on OS X, tweak RtMidi find module
2014-07-08 14:16:22 -07:00
wangyix
df1b4107fd
moved qAudioOutput buffer overflow debug option to existing audio menu
2014-07-08 13:01:05 -07:00
wangyix
6ee52e97c8
added dev menu option to disable _audioOutput overflow check
2014-07-08 12:23:43 -07:00
Stephen Birarda
8c5979813f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-08 12:17:15 -07:00
Stephen Birarda
d1afe127c3
updates to RtMidi find module to look for static or dynamic lib
2014-07-08 12:06:43 -07:00
Philip Rosedale
e75b9dc832
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-08 11:43:45 -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
AndrewMeadows
e34f592a83
Merge pull request #3132 from birarda/master
...
fix stubbing of MIDIManager if HAVE_RTMIDI not defined
2014-07-08 10:36:05 -07:00
Stephen Birarda
e33b07819c
wrap a missed midi method
2014-07-08 10:24:21 -07:00
Clément Brisset
4f756c31f2
Merge pull request #3133 from huffman/19819
...
Code Review for Job #19819
2014-07-08 10:07:26 -07:00
Stephen Birarda
286d50f4f2
fix if/endif in MIDIManager header
2014-07-08 09:55:03 -07:00
Stephen Birarda
171660ded7
fix stubbing of MIDIManager if HAVE_RTMIDI not defined
2014-07-08 09:52:50 -07:00
Ryan Huffman
c509ae9ffd
Merge branch 'master' of git://github.com/highfidelity/hifi into 19828
2014-07-07 13:49:26 -07:00
Ryan Huffman
df6bbd2944
Fix goTo* dialog bug with chat on Mac OSX
...
If chat was open, when pressing enter on Mac OSX the operation would not go through and
would focus on the chat window. There seems to be a deeper issue, but
it was decided to go with the simple solution of making these dialog
windows not of `Sheet` type.
2014-07-07 13:47:31 -07:00
Andrzej Kapolka
f7f9dfd26e
Merge pull request #3128 from Atlante45/replace_qnetworkaccessmanager
...
Downgrade of NetworkAccessManager
2014-07-07 12:21:45 -07:00
Stephen Birarda
dd8f7e81b1
update the interface icon
2014-07-07 11:46:57 -07:00
Atlante45
a225df63f6
Removed deprecated moveToThread()
2014-07-07 11:40:03 -07:00
Andrzej Kapolka
21ba9bf410
Because attempting to compile the new voxel texture shader causes my system
...
(Ubuntu LTS, Intel graphics) to hang, change it to compile lazily when
activated.
2014-07-07 11:22:17 -07:00
Philip Rosedale
3280691491
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-03 15:54:29 -07:00
Brad Hefta-Gaub
db5abbc363
Merge pull request #3124 from Atlante45/replace_qnetworkaccessmanager
...
Fixed invokeMethod unable to find method + fixed children in different t...
2014-07-03 14:54:11 -07:00
Clément Brisset
a7be28b547
Merge pull request #3123 from AndrewMeadows/ragdoll
...
return to default pose after hydra disconnect
2014-07-03 14:49:26 -07:00
Atlante45
8e1b8334a1
Fixed invokeMethod unable to find method + fixed children in different thread
2014-07-03 14:46:17 -07:00
Andrew Meadows
662136f01c
reset timer as optimization
2014-07-03 14:13:27 -07:00
Andrew Meadows
0f7859bf83
fix return to default pose after hydra disconnect
2014-07-03 14:09:14 -07:00
Philip Rosedale
a25c08a1b7
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-03 14:08:19 -07:00
Andrew Meadows
843a4db650
rotation offset for hydra controllers
2014-07-03 13:50:27 -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
Stephen Birarda
15619b5a98
don't require RtMidi if it isn't present
2014-07-03 13:30:14 -07:00
wangyix
94c0c15c76
fixed more small bugs with AudioRingBuffer constructor
2014-07-03 12:06:18 -07:00
ZappoMan
a53d007c33
add support for getting current animation details for running avatar animations
2014-07-03 11:59:18 -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
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
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
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
edcf4d04f8
Fixed bug when switching from normal view to oculus
2014-07-02 17:05:06 -07:00
