ZappoMan
e800d5457b
Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities
2014-07-08 13:02:31 -07:00
wangyix
df1b4107fd
moved qAudioOutput buffer overflow debug option to existing audio menu
2014-07-08 13:01:05 -07:00
TonyPeng
e212f9f42e
Change fog start to use default value.
2014-07-08 12:48:01 -07:00
barnold1953
0ce7b178b0
Made Oculus UI framebuffer resize when window resizes
2014-07-08 12:47:41 -07:00
TonyPeng
4e04cecd8c
Use glFog for haze (better performance).
2014-07-08 12:28:44 -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
barnold1953
cc63f706a7
Functional sixense "laser" oculus selection mode.
2014-07-08 11:43:24 -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
TonyPeng
34e973c516
Merge branch 'master' of https://github.com/highfidelity/hifi into light_and_haze
...
Merge in from highfidelity.
2014-07-08 10:37:46 -07:00
TonyPeng
1baa187a66
add javascript example for changing avatar's local lights.
2014-07-08 10:37:42 -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
Andrzej Kapolka
db1a9fa09b
Fix for streaming error.
2014-07-08 10:14:41 -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
TonyPeng
94e81da557
Added local lights to avatar. Added haze to voxel.
2014-07-08 09:44:28 -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
Atlante45
05d74e2bb1
Added ArrayBuffer unit tests
2014-07-07 18:59:57 -07:00
Atlante45
96a1390d8f
Fixed up ArrayBuffer::slice() behaviour
2014-07-07 18:58:53 -07:00
Andrzej Kapolka
aaae07087c
Fix for local edits.
2014-07-07 18:09:50 -07:00
Atlante45
f9b739a0d1
Functional ArrayBuffer class following Qt standard
2014-07-07 18:02:33 -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
Atlante45
c246205692
Base implementation of ArrayBuffer
2014-07-07 15:04:45 -07:00
ZappoMan
a4b7673a2c
some more virtual entity work
2014-07-07 14:29:03 -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
ZappoMan
3145d150f3
more work on virtual entities, unit tests passing woot
2014-07-07 12:56:32 -07:00
Atlante45
12eeb50cbe
Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays
2014-07-07 12:24:47 -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
ZappoMan
29e02f2681
more hacking on virtualizing entities
2014-07-07 09:36:31 -07:00
