Thijs Wenker
2dcbe18e5b
Fix for weird avatar Switch Vive -> Desktop mode
2016-10-28 04:07:20 +02:00
Brad Hefta-Gaub
9126a7db80
Merge pull request #8921 from jherico/openvr_min_spec
...
Display warning overlay instead of scene when below min spec
2016-10-27 17:36:08 -07:00
Brad Davis
e9db8be435
Fix linux build
2016-10-27 16:51:52 -07:00
Howard Stearns
d2b83b47ba
Merge pull request #8936 from zzmp/clean/audio-mixer
...
clean audio mixer
2016-10-27 15:57:16 -07:00
Howard Stearns
9a97867919
Merge pull request #8937 from zzmp/fix/agent-audio-underflow
...
fix agent audio underflow
2016-10-27 15:51:58 -07:00
Brad Davis
018d945b85
Display warning overlay instead of scene when below min spec
2016-10-27 15:51:26 -07:00
Ryan Downe Karpf
614956a86b
Merge pull request #8938 from Atlante45/splash
...
Disable console splash screen
2016-10-27 14:47:42 -07:00
Zach Pomerantz
428bb8e518
rm unused OffscreenQmlSurface const
2016-10-27 14:40:51 -07:00
Zach Pomerantz
a7d54b8e0a
rm unused lastCutoffRatio
2016-10-27 14:38:17 -07:00
Zach Pomerantz
c14a928db5
convert size_t to int
2016-10-27 14:34:10 -07:00
Atlante45
4cb1d75ca4
Disable console splash screen
2016-10-27 14:12:17 -07:00
Brad Davis
012e215f62
Merge pull request #8922 from ZappoMan/report45hzTarget
...
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
2016-10-27 14:03:07 -07:00
Brad Hefta-Gaub
6d94df346f
add async reprojection stat to oculus too
2016-10-27 14:00:30 -07:00
Zach Pomerantz
32040a9047
add stat for streams in audio mixer
2016-10-27 13:55:17 -07:00
Zach Pomerantz
68f05bee87
fix underflow for agent audio timer
2016-10-27 13:47:22 -07:00
Zach Pomerantz
20bac5aeef
clean up broadcastMixes
2016-10-27 13:47:00 -07:00
Zach Pomerantz
9e9f8666ce
clean up handleMismatchAudioFormat comment
2016-10-27 13:46:53 -07:00
Zach Pomerantz
04e5d8e302
initialize audio client data
2016-10-27 13:46:42 -07:00
Zach Pomerantz
3e16dabb75
fix audio mixer throttling
2016-10-27 13:46:33 -07:00
Clément Brisset
745f6546dd
Merge pull request #8932 from huffman/fix/gamepad-help-image
...
Update help image for gamepad to include grab and click lasers
2016-10-27 13:31:15 -07:00
Brad Hefta-Gaub
bfe6ebb44f
some tweaks
2016-10-27 12:04:46 -07:00
Ryan Huffman
aa3af36933
Merge pull request #8933 from huffman/fix/away-vulnerability
...
Fix away.js vulnerability
2016-10-27 11:55:36 -07:00
Brad Hefta-Gaub
510786bc0f
Merge pull request #8923 from Atlante45/steamvr
...
Add getter for SteamVR's buildID to SteamClient
2016-10-27 11:38:35 -07:00
Brad Hefta-Gaub
c3f5df8f0b
Merge branch 'master' of https://github.com/highfidelity/hifi into report45hzTarget
2016-10-27 11:36:56 -07:00
Ryan Huffman
1782f97dbd
Fix away.js not unsubscribing on shutdown
2016-10-27 11:12:46 -07:00
Ryan Huffman
a801832a55
Fix away.js allowing any user to disable away.js
2016-10-27 11:12:31 -07:00
Chris Collins
e7ea30b1cc
Merge pull request #8924 from huffman/fix/batch-loader-race
...
Fix race condition in BatchLoader
2016-10-27 11:04:24 -07:00
Ryan Huffman
5326202313
Update help image for gamepad to include Note
2016-10-27 10:54:49 -07:00
Chris Collins
ab8e5759b0
Merge pull request #8929 from ZappoMan/addAudioStatsToMenu
...
add a menu item to run audio stats script
2016-10-27 10:43:20 -07:00
Clément Brisset
07450b420a
Merge pull request #8930 from ZappoMan/fixLaunchFromSteam
...
fix the timing of the launchedFromSteam property
2016-10-27 10:22:48 -07:00
Brad Hefta-Gaub
c6d89f181a
CR feedback
2016-10-27 10:08:16 -07:00
Brad Hefta-Gaub
d778b3b4ce
fix the timing of the launchedFromSteam property
2016-10-27 10:00:48 -07:00
Ryan Huffman
946f3782f3
Fix indentation in BatchLoader
2016-10-27 09:59:17 -07:00
Brad Hefta-Gaub
03946748bc
Merge pull request #8928 from hyperlogic/bug-fix/more-openvr-crash-fixes
...
Fix for crash in openvr on startup
2016-10-26 22:45:33 -07:00
Brad Hefta-Gaub
76344f3253
add a menu item to run audio stats script
2016-10-26 22:41:56 -07:00
Brad Davis
a8d6e04816
Merge pull request #8917 from jherico/openvr_async
...
Disable OpenVR submit thread when async reprojection is enabled
2016-10-26 17:54:17 -07:00
Anthony J. Thibault
7ac3a189a0
generate pdb files for plugins as well
...
I'm going to coordinate with marco to ensure that these pdb files are uploaded to bugsplat as well.
It will make hard to reproduce crashes in display plugins easier to diagnose in the future.
2016-10-26 17:48:28 -07:00
Anthony J. Thibault
1ea018db1d
Fix for crash in openvr on startup
...
pluginActivate can fail and return false, when steamvr is in a "Not Ready" state.
In practice this can occur on a botched steamvr install, or when the vr compositor process is unable to start.
When pluginActivate returns false, there's some sort of race condition where pluginUpdate will still be called.
But it's only reproducible in release builds, without the debugger attached.
This commit prevents pluginUpdate from crashing by making sure that the openvr _system ptr is valid first.
2016-10-26 17:40:34 -07:00
Brad Davis
a53049b186
Consolidate activity tracking code
2016-10-26 17:19:24 -07:00
Stephen Birarda
8565f870e9
Merge pull request #8925 from birarda/master
...
add a timer to Socket to check for readyRead backup
2016-10-26 16:57:15 -07:00
Stephen Birarda
4abc4adde9
add a timer to check for readyRead backup
2016-10-26 16:18:12 -07:00
Brad Davis
f4f1b04cf0
Use OpenVR to determine if async reprojection is enabled
2016-10-26 16:02:06 -07:00
Brad Davis
1c89fa2291
Make threaded submit in OpenVR controllable from menu
2016-10-26 15:28:42 -07:00
Brad Davis
857f5a69d6
Don't reserve additional thread when we're not using one
2016-10-26 15:28:41 -07:00
Brad Davis
e7355e84f3
Disable OpenVR submit thread
2016-10-26 15:28:40 -07:00
Ryan Huffman
10e6157ab9
Fix race condition in BatchLoader
2016-10-26 15:16:29 -07:00
Atlante45
f26ddc6f8b
Add getter for SteamVR's buildID to SteamClient
2016-10-26 14:51:48 -07:00
Brad Hefta-Gaub
15ee56a50f
Merge pull request #8920 from ZappoMan/launchFromSteamOptions
...
add app property when the app was launched from steam
2016-10-26 14:25:46 -07:00
Brad Hefta-Gaub
23b74c7aff
when vive is on i5 report a target frame rate of 45 so we can see that in stats
2016-10-26 14:20:58 -07:00
Brad Hefta-Gaub
e464858c4c
use SteamClient::isRunning() instead of command line param
2016-10-26 14:08:18 -07:00
