Commit graph

48766 commits

Author SHA1 Message Date
howard-stearns
050d343849 styling changes 2016-11-16 15:54:11 -08:00
Seth Alves
e83922f9e4 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak 2016-11-16 15:39:57 -08:00
Seth Alves
b9326affa3 Merge pull request #9087 from druiz17/parentID
Fix - When avatar's parent is deleted, avatar does not move
2016-11-16 15:30:52 -08:00
Seth Alves
a14ff22df3 update render-land bounds when polyvox moves 2016-11-16 15:10:43 -08:00
Dante Ruiz
66ff81f450 Another function name change 2016-11-16 22:32:15 +00:00
Seth Alves
d097fa7982 fix polyvox memory leak 2016-11-16 14:10:50 -08:00
Dante Ruiz
9c4ae9df5a function name change 2016-11-16 22:09:22 +00:00
Chris Collins
44b2b090df Merge pull request #9010 from samcake/orange
Improve Input Stage Format switching in GL45Backend
2016-11-16 14:00:17 -08:00
Atlante45
2f2da8ccd3 Do not read launchClientNowState if client disabled 2016-11-16 13:15:10 -08:00
Dante Ruiz
ff7c11d48c Fixed avatar parent delete issue 2016-11-16 13:03:34 -08:00
howard-stearns
9f2b6dc40b location cleanup 2016-11-16 12:53:57 -08:00
Brad Davis
fa841620ab Disable glow line temporarily while fixing implementation 2016-11-16 12:50:47 -08:00
Brad Hefta-Gaub
5ccfe3f6e8 Merge pull request #9083 from huffman/feat/menu-docs
Add jsdoc comments to Menu and Overlays
2016-11-16 12:40:51 -08:00
Ryan Huffman
75eafbb349 Add docs to Paths 2016-11-16 12:11:32 -08:00
Ryan Huffman
c6b64081fc Add Overlays jsdocs 2016-11-16 12:01:05 -08:00
Ryan Huffman
179eed5d11 Add Vec2 and Vec3 defiitions to jsdoc 2016-11-16 11:56:42 -08:00
samcake
d95b682b87 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-16 11:10:01 -08:00
Atlante45
722032080a Make clear popup is from the Sandbox 2016-11-16 11:03:15 -08:00
Atlante45
9e0230980b Enable Server Only install 2016-11-16 10:52:30 -08:00
Ryan Huffman
7e9df928f4 Add jsdoc comments to Menu 2016-11-16 10:49:50 -08:00
samcake
b74a1af5ba Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-11-16 10:48:30 -08:00
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
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -08:00
Andrew Meadows
1625430e0e Merge pull request #9079 from AndrewMeadows/oobe8
out-of-body-experience: hover-drive works in HMD
2016-11-15 16:30:41 -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
Andrew Meadows
d749697c46 scan bottom points during hover-HMD-drive 2016-11-15 12:05:44 -08:00
David Rowe
9b270834dd Merge branch 'master' into 21089 2016-11-16 08:51:48 +13:00
Andrew Meadows
a04b7ae297 fix hover-drive in HMD 2016-11-15 11:45:09 -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