Commit graph

47751 commits

Author SHA1 Message Date
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
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
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
Atlante45
384f3d9321 Fix potential race in NodeList 2016-10-25 16:58:21 -07:00
Zach Pomerantz
78a04255ab amend qml/audio ordering comment 2016-10-25 16:35:56 -07:00
Chris Collins
cf9b82576f Merge pull request #8899 from highfidelity/RC-23
Beta Release 23 - Includes up to Developer Release 5572
2016-10-25 16:26:10 -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
Brad Hefta-Gaub
bf7d19a805 tweak format of gl_info 2016-10-25 15:48:22 -07:00
Brad Hefta-Gaub
b506e33baf add gl info and gpu free memory to user stats 2016-10-25 15:48:12 -07:00
Brad Hefta-Gaub
4aa96c9acc add location and build info to user activity stats 2016-10-25 15:48:03 -07:00
Chris Collins
ad09ced3f8 Merge pull request #8906 from ZappoMan/improvedStats
more detailed stats in user heartbeat
2016-10-25 15:47:07 -07:00
howard-stearns
f7742b99a9 update crowd-agent reference 2016-10-25 15:35:11 -07:00
howard-stearns
65ac73bfc0 use s3 instead of gh-pages 2016-10-25 15:29:48 -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
Ryan Huffman
727fabeab2 Fix away.js logging all Messages 2016-10-25 15:28:11 -07:00
Brad Hefta-Gaub
822e088240 tweak format of gl_info 2016-10-25 15:20:10 -07:00
howard-stearns
6116060858 Merge branch 'master' of https://github.com/highfidelity/hifi into improve-domain-check 2016-10-25 14:58:58 -07:00
howard-stearns
9561142c43 improvements 2016-10-25 14:58:27 -07:00
Brad Hefta-Gaub
e22a2e9e2f add gl info and gpu free memory to user stats 2016-10-25 14:56:54 -07:00
howard-stearns
2fbb2338c5 don't complain about other's finishedSound messages 2016-10-25 14:56:05 -07:00
Ryan Huffman
8d692c1d16 Update home content set 2016-10-25 14:24:02 -07:00
Brad Hefta-Gaub
272055b6ee add location and build info to user activity stats 2016-10-25 14:19:44 -07:00
Chris Collins
164955dc81 Merge pull request #8903 from huffman/feat/update-content-set
Update home content set
2016-10-25 14:11:06 -07:00
Seth Alves
3903a51062 fix a couple of crash-on-exits 2016-10-25 13:58:48 -07:00
Ryan Huffman
4a28ca670a Update vive controller display to not hide on equip 2016-10-25 13:58:15 -07:00