Commit graph

48351 commits

Author SHA1 Message Date
Atlante45
d7d54dd82f Only launch interface if selected 2016-11-16 10:44:59 -08:00
Ken Cooke
171cb14087 New WASAPI Qt plugins that implement multichannel formats using WAVEFORMATEXTENSIBLE.
QAudioInput, QAudioOutput, and IsFormatSupported() now support channels > 2.
dwChannelMapping is always set to 0xffffffff (1:1 passthru).
2016-11-16 10:38:51 -08:00
howard-stearns
fef68ac53a gap between top and scroll 2016-11-16 10:02:17 -08:00
Anthony J. Thibault
066ddad25a Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20. 2016-11-16 09:39:55 -08:00
howard-stearns
f21036c742 Merge branch 'master' of https://github.com/highfidelity/hifi into no-snapshots-welcome 2016-11-16 09:18:41 -08:00
Brad Hefta-Gaub
01b2a893be Merge pull request #9078 from davidkelly/dk/2263
Logging to help find audio device issue
2016-11-16 08:25:55 -08:00
howard-stearns
b0518feee4 split ToolbarButton.qml into a stateful image part 2016-11-15 14:59:27 -08:00
howard-stearns
182050c4b9 don't process stale query responses 2016-11-15 14:34:23 -08:00
Brad Davis
fda2cde006 Fix buffer leak in line entity 2016-11-15 14:16:54 -08:00
howard-stearns
9809515853 styling 2016-11-15 14:12:27 -08:00
Brad Hefta-Gaub
84573d373b Merge pull request #9070 from huffman/fix/docs
Add jsdoc to Camera
2016-11-15 13:46:16 -08:00
Ryan Huffman
936ff5e0be Merge pull request #9076 from birarda/domain-agent-guard
guard patched agents asking for other agents in domain-server
2016-11-15 13:01:49 -08:00
David Kelly
40914d9790 Logging to help find audio device issue
We sometimes show duplicate devices in Audio > Devices menu.  But
I cannot reproduce it, so maybe best thing is log timing and contents
of input and output device arrays, to try to run down where the issue
is.
2016-11-15 12:58:51 -08:00
Ken Cooke
b19a44e046 On Windows, set audio format to match the internal mix format.
This works around multichannel bugs in the Qt audio framework.
2016-11-15 10:37:32 -08:00
Stephen Birarda
39afb24982 explictly remove Agent from NIS for other Agents 2016-11-15 10:37:19 -08:00
Brad Hefta-Gaub
fe9e97346f Merge pull request #9051 from sethalves/fix-include-race
block scripts until follow-on includes are finished but still avoid multiple evaluation of included urls
2016-11-15 10:21:24 -08:00
Stephen Birarda
1791a1c1fe never send agents to other agents 2016-11-15 10:15:17 -08:00
samcake
80240123b9 Merging with upstream 2016-11-15 10:01:06 -08:00
Seth Alves
d73fc1681c Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-15 09:11:06 -08:00
Seth Alves
bc9b29bd71 Merge branch 'fix-include-race' of github.com:sethalves/hifi into fix-include-race 2016-11-15 09:10:56 -08:00
Ken Cooke
30c189e624 channelCount math cleanup 2016-11-15 09:10:05 -08:00
Brad Hefta-Gaub
0cd70e90c7 Merge pull request #9075 from ZappoMan/fixMacOpenGL
fix for mac min openGL version
2016-11-15 09:01:02 -08:00
Brad Hefta-Gaub
2200e32ba3 Merge pull request #9073 from ZappoMan/fixOculusWithOpenVR
disable threaded reprojection when running oculus in OpenVR
2016-11-15 08:27:54 -08:00
samcake
9267f4eaaf Fix the merge with upstream and the new stereo drawcall, fix the timer reporting on mac and fix the openGLChecker quicking on mac 2016-11-15 00:40:39 -08:00
Brad Hefta-Gaub
5dd33c8dce fix for mac min openGL version 2016-11-14 20:58:09 -08:00
Brad Hefta-Gaub
86430e4121 Merge pull request #8960 from samcake/red-backup-many-stereo-paths
Introduce Instanced Stereo Drawcall
2016-11-14 18:30:42 -08:00
Anthony J. Thibault
eb401c125a Bug fix for blank webEntities during long sessions
In prolonged sessions _currentWebCount would reach MAX_CONCURRENT_WEB_VIEWS and prevent new webEntities from being properly created and initialized.

The _currentWebCount inside of RenderableWebEntityItem would become inflated when buildWebSurface is called without a currentContext.
The early return did not properly take this into account.  Instead we move the increment after the early return and right before the _webSurface is actually created.
2016-11-14 18:01:47 -08:00
Ryan Huffman
5fd1ae64b0 Begin adding entities jsdoc 2016-11-14 16:54:55 -08:00
Brad Hefta-Gaub
3a68f48cd7 disable threaded reprojection when running oculus in OpenVR 2016-11-14 16:30:18 -08:00
Philip Rosedale
981f505a9c Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-14 14:26:45 -08:00
Chris Collins
786d09795b Merge pull request #9066 from birarda/ignored-ignore-ignoree
don't send audio/avatar data for ignoree to ignored node
2016-11-14 14:02:51 -08:00
Ryan Huffman
3fcc2d3fa5 Add jsdoc to Clipboard 2016-11-14 13:52:16 -08:00
Ryan Huffman
7e2bb0e5ed Cleanup camera docs 2016-11-14 13:51:51 -08:00
howard-stearns
6078b833a1 Merge remote-tracking branch 'origin/group-snapshots-by-place' into no-snapshots-welcome 2016-11-14 13:47:32 -08:00
howard-stearns
4cdda7c20f Merge remote-tracking branch 'origin/quasi-tabbed-goto' into no-snapshots-welcome 2016-11-14 13:13:58 -08:00
Brad Hefta-Gaub
5272a9b460 Merge pull request #9069 from Atlante45/blast-screen
Fix Blast screen typos
2016-11-14 13:10:50 -08:00
Ryan Huffman
ec86b82079 Add jsdoc to Camera 2016-11-14 12:14:24 -08:00
samcake
07e8238b0e REmove uneeded macros 2016-11-14 12:09:44 -08:00
Atlante45
f8be4227d9 Fix Blast screen typos 2016-11-14 12:06:25 -08:00
samcake
f3e1ed4b88 Merging and cleaning up the code path for the 2 flavors of gl 2016-11-14 11:57:00 -08:00
samcake
b888af15e4 Fix merge 2016-11-14 11:15:27 -08:00
Stephen Birarda
dadcaa9959 don't send audio/avatar data for ignoree to ignored node 2016-11-14 10:12:36 -08:00
Seth Alves
28d1b5430d Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-14 10:12:24 -08:00
Seth Alves
43b73f0380 Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-14 10:00:46 -08:00
Chris Collins
e599e13809 Merge pull request #9063 from sethalves/fix-some-crash-on-exits
Fix some crash on exits
2016-11-14 09:20:03 -08:00
Brad Hefta-Gaub
cc6d68ffdf Merge pull request #8973 from humbletim/fix-batched-script-keys
Use matching hash keys for input/output when batch-loading scripts.
2016-11-14 08:13:32 -08:00
Brad Hefta-Gaub
dd23fcc0c9 Merge pull request #9008 from hyperlogic/feature/debug-draw-marker-color
Add color support to debug draw marker rendering
2016-11-14 08:12:57 -08:00
Brad Hefta-Gaub
b0fc17cbb9 Merge pull request #9060 from sethalves/fix-plugins-work-with-asan
fix Linux plugins when using address-sanitizer
2016-11-14 08:12:38 -08:00
Chris Collins
3d5a178a1d Merge pull request #9064 from birarda/mod-overlay-cleanup
fix kick and mute overlay cleanup
2016-11-13 16:15:18 -08:00
Seth Alves
92e24e6ded code review 2016-11-13 16:09:57 -08:00