Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-19 09:28:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14513 commits 76 branches 59 tags 1.2 GiB
Commit graph

14513 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
David Rowe
305623d8a7 Add option to hide focus indicators 2014-07-08 21:37:08 -07:00
Philip Rosedale
272e8c6e97 Merge pull request #3140 from ctrlaltdavid/script_error_reporting 
Fix script errors not being reported
 2014-07-08 16:56:26 -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
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
Brad Hefta-Gaub
29a2a9aaa2 Merge pull request #3135 from wangyix/quick_audio_PR 
changed Audio.cpp to not overflow _audioOutput buffer; fixed premature injector stream deletion; disabled silent-frame dropping in non-dyanimic-jitter-buffers mode
 2014-07-08 13:56:31 -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
Stephen Birarda
84aa4b9cda use compiler default C++ Standard Library on OS X 2014-07-08 11:59:10 -07:00
Philip Rosedale
e75b9dc832 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-08 11:43:45 -07:00
Philip Rosedale
0e117966f7 better clapping 2014-07-08 11:43:06 -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
Clément Brisset
0a30251411 Merge pull request #3131 from ey6es/metavoxels 
Basic incremental streaming of metavoxel data through a reliable channel (first attempts unreliable channel, then moves it over if too big).
 2014-07-08 10:00:57 -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
Clément Brisset
5d0ab08054 Merge pull request #3130 from huffman/19828 
Code Review for Job #19828
 2014-07-08 09:40:32 -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
6bf4182804 Fix for send timer. 2014-07-07 16:25:13 -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
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
44befbb019 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-07 12:21:56 -07: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
7adf43277f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-07 11:27:31 -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
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
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
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
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
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