Commit graph

18059 commits

Author SHA1 Message Date
howard-stearns
90ebbb79c1 centered toolbar 2016-11-02 15:37:53 -07:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Chris Collins
6698b1617b Merge pull request #8945 from thoys/patch-8
Fix Oculus hand controllers to only work in HMD
2016-10-31 11:02:40 -07:00
Chris Collins
3b6faefe05 Merge pull request #8931 from sethalves/possible-fix-for-2068
Possible fix for 2069
2016-10-31 10:21:01 -07:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -07:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Stephen Birarda
207d26091c Merge pull request #8953 from Atlante45/being-of-light
Update being of light model
2016-10-28 15:36:19 -07:00
Chris Collins
d9d9119dcb Merge pull request #8951 from zzmp/fix/crash-on-web-wasapi
fix crash on shutdown from web audio captures
2016-10-28 15:23:39 -07:00
Atlante45
8ebe92487a Update being of light model 2016-10-28 14:56:36 -07:00
Brad Hefta-Gaub
cec982b004 Merge pull request #8952 from jherico/openvr_min_spec
Updating min spec overlay image
2016-10-28 14:47:21 -07:00
Brad Davis
93be00fe79 Updating min spec overlay 2016-10-28 14:45:24 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Seth Alves
e15043754c Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 11:36:09 -07:00
Andrew Meadows
fe716b3641 Merge pull request #8941 from thoys/patch-7
QuickFix for weird avatar when switch Vive -> Desktop mode
2016-10-28 11:14:40 -07:00
Thijs Wenker
597e52636a Fix Oculus hand controllers to only work in HMD 2016-10-28 19:22:44 +02:00
Brad Hefta-Gaub
4f6cbf762d Merge pull request #8942 from jherico/openvr_min_spec
Updates for min spec check for Steam
2016-10-27 20:08:35 -07:00
Brad Hefta-Gaub
97f622f003 Merge pull request #8940 from hyperlogic/bug-fix/web-engine-crash-when-swiching-domains
Fix for crash in QtWebEngineCore when rapidly switching domains
2016-10-27 20:01:31 -07:00
Brad Davis
23fc865d40 Updates for min spec check 2016-10-27 19:28:46 -07:00
Thijs Wenker
2dcbe18e5b Fix for weird avatar Switch Vive -> Desktop mode 2016-10-28 04:07:20 +02:00
Anthony J. Thibault
1fc310434e Fix for crash in QtWebEngineCore when rapidly switching domains
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
Brad Davis
e9db8be435 Fix linux build 2016-10-27 16:51:52 -07:00
Brad Davis
018d945b85 Display warning overlay instead of scene when below min spec 2016-10-27 15:51:26 -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
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
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
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
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -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
Brad Hefta-Gaub
76344f3253 add a menu item to run audio stats script 2016-10-26 22:41:56 -07:00
Brad Davis
1c89fa2291 Make threaded submit in OpenVR controllable from menu 2016-10-26 15:28:42 -07:00
Atlante45
f26ddc6f8b Add getter for SteamVR's buildID to SteamClient 2016-10-26 14:51:48 -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
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
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
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 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
Chris Collins
3b31b28622 Merge pull request #8904 from sethalves/fix-a-couple-crash-on-exits
fix a couple of crash-on-exits
2016-10-25 17:03:21 -07:00
Zach Pomerantz
78a04255ab amend qml/audio ordering comment 2016-10-25 16:35:56 -07:00
Brad Hefta-Gaub
001cfc7e15 Merge pull request #8901 from samcake/blue
Adding more detailed counters for texture memory consumption
2016-10-25 16:19:56 -07:00
Zach Pomerantz
5413d97089 cleanup qml before audio 2016-10-25 15:54:08 -07:00
Anthony Thibault
23aa626755 Destroy render scene & engine before Application is destroyed
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.

There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal.  Also, we guard against null
scene pointer dereferences.  Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Brad Hefta-Gaub
822e088240 tweak format of gl_info 2016-10-25 15:20:10 -07:00