Commit graph

14467 commits

Author SHA1 Message Date
Aleric Inglewood
d555017fb4 Coding style fix. 2014-07-10 19:25:00 +02:00
Aleric Inglewood
d1b9611040 Remove debug output lines. 2014-07-10 18:52:38 +02:00
Aleric Inglewood
801be7edee Stop QMenuBar to steal keyboard focus when pressing Alt key in Linux. 2014-07-09 13:55:38 +02:00
Andrzej Kapolka
f7f9dfd26e Merge pull request #3128 from Atlante45/replace_qnetworkaccessmanager
Downgrade of NetworkAccessManager
2014-07-07 12:21:45 -07:00
Atlante45
8382f764cd Got rid of unneccessary Q_DISABLE_COPY() 2014-07-07 12:15:55 -07:00
Clément Brisset
85c67fd77d Merge pull request #3129 from birarda/master
update the interface icon
2014-07-07 12:01:49 -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
Atlante45
982a50dbcf Remove multithread access from NetworkAccessManager for the time being 2014-07-07 11:33:54 -07:00
Andrzej Kapolka
34b93670e2 Merge pull request #3127 from ey6es/master
Because attempting to compile the new voxel texture shader causes my sys...
2014-07-07 11:27:10 -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
Brad Hefta-Gaub
b7b46b0a3b Merge pull request #3126 from Atlante45/replace_qnetworkaccessmanager
Hopeful fix to ACs crash
2014-07-03 21:48:15 -07:00
Atlante45
b0e83c32ff Hopeful fix to ACs crash 2014-07-03 18:17:01 -07:00
Philip Rosedale
bc3823f1f7 Merge pull request #3125 from birarda/master
fix the voices inside your head
2014-07-03 16:55:50 -07:00
Stephen Birarda
ecbd62104c cause sounds within an epsilon distance to be unattenuated 2014-07-03 16:43:12 -07:00
Stephen Birarda
7ff0648d8a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 16:32:46 -07:00
Stephen Birarda
438e0b501b fix the voices inside your head 2014-07-03 16:32:38 -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
Andrew Meadows
843a4db650 rotation offset for hydra controllers 2014-07-03 13:50:27 -07:00
Clément Brisset
3729428c2e Merge pull request #3122 from birarda/audio-rolloff
change the audio rolloff function
2014-07-03 13:49:59 -07:00
Stephen Birarda
04e7df1a3f change the audio rolloff function 2014-07-03 13:46:38 -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
Stephen Birarda
c0d0ca5066 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff 2014-07-03 13:37:06 -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
59e8a98412 added example script 2014-07-03 12:05: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
6665a9427a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 11:39:40 -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
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