Commit graph

47775 commits

Author SHA1 Message Date
Zach Pomerantz
72282257bd group udt::Socket errors as debug logs 2016-10-27 13:45:58 -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
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
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
e464858c4c use SteamClient::isRunning() instead of command line param 2016-10-26 14:08:18 -07:00
Brad Hefta-Gaub
5f2b4c2a7f CR feedback 2016-10-26 13:27:11 -07:00
Brad Hefta-Gaub
f95a731249 add app property when the app was launched from steam 2016-10-26 13:22:03 -07:00
Chris Collins
de419c2818 Merge pull request #8912 from Atlante45/nodelist-race
Fix potential race in NodeList
2016-10-26 13:00:05 -07:00
Chris Collins
d25a4fb1cb Merge pull request #8910 from zzmp/fix/qml-audio-shutdown-order
fix shutdown order of qml/audio
2016-10-26 11:37:54 -07:00
Howard Stearns
5d42e7a5e6 Merge pull request #8911 from davidkelly/dk/agentAvatarAudioArtifacts
Dk/agent avatar audio artifacts
2016-10-26 09:56:43 -07:00
Howard Stearns
047b02141f Merge pull request #8908 from howard-stearns/improve-domain-check
Improve domain check
2016-10-25 19:45:37 -07:00
Howard Stearns
58d14decbb linting 2016-10-25 19:07:52 -07:00
Brad Hefta-Gaub
2fa4f53c4c Merge pull request #8915 from highfidelity/stable
Stable to master
2016-10-25 18:52:29 -07:00
Howard Stearns
d8c5cdd910 fix reporting 2016-10-25 18:42:04 -07:00
Brad Hefta-Gaub
863bf067b7 Merge pull request #8893 from jherico/texture_force_sparse
Changes to texture loading rules
2016-10-25 18:22:42 -07:00
Brad Hefta-Gaub
ac3d072915 Merge pull request #8914 from birarda/master
Beta Release 24 - Includes up to Developer Release 5572
2016-10-25 18:10:38 -07:00
Brad Hefta-Gaub
b0b950e132 Merge pull request #8898 from ctrlaltdavid/fix-overlaywebwindow-keyboard
Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes
2016-10-25 17:59:46 -07:00
Brad Davis
ce627eeea1 Updated metrics 2016-10-25 17:49:51 -07:00
Zach Pomerantz
4913654f44 Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-audio-shutdown-order 2016-10-25 17:49:30 -07:00
Brad Davis
a9bf2a5cd3 Limit max texture size, don't force cubemaps to sparse page size 2016-10-25 17:47:42 -07:00
Brad Davis
78d55011a4 Limit sparse textures to 1 GB for now 2016-10-25 17:47:41 -07:00
Brad Davis
f26dc4dcb9 Don't rectify skybox textures 2016-10-25 17:47:40 -07:00
Brad Davis
4bb8d4e78e Force all loaded textures to sparse compatible sizes 2016-10-25 17:47:39 -07:00
Stephen Birarda
b16f5a4752 include BuildInfo for USE_STABLE_GLOBAL_SERVICES 2016-10-25 17:42:12 -07:00
Brad Hefta-Gaub
9d23fbeafb Merge pull request #8907 from huffman/fix/away-annoying-log-messages
Fix away.js logging all incoming Messages
2016-10-25 17:39:07 -07:00
Brad Hefta-Gaub
56b0995047 Merge pull request #8909 from hyperlogic/bug-fix/crash-on-exit-fix
Crash on exit fix for render items
2016-10-25 17:34:46 -07:00