Atlante45
f26ddc6f8b
Add getter for SteamVR's buildID to SteamClient
2016-10-26 14:51:48 -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
Brad Hefta-Gaub
2fa4f53c4c
Merge pull request #8915 from highfidelity/stable
...
Stable to master
2016-10-25 18:52:29 -07:00
Brad Davis
ce627eeea1
Updated metrics
2016-10-25 17:49:51 -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
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
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
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
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
Brad Hefta-Gaub
e22a2e9e2f
add gl info and gpu free memory to user stats
2016-10-25 14:56:54 -07:00
Brad Hefta-Gaub
272055b6ee
add location and build info to user activity stats
2016-10-25 14:19:44 -07:00
Seth Alves
3903a51062
fix a couple of crash-on-exits
2016-10-25 13:58:48 -07:00
samcake
133b0b38fd
Fixing build issue on non win
2016-10-25 13:24:39 -07:00
samcake
c586bef452
Actually remove the multiplication of the color buffer cost by the swapchain length in the pixel SIze estimation since it doesn;t look true
2016-10-25 12:56:26 -07:00
samcake
507d3e5a39
IMprove the counting and namoing of the new couters the gl swapchain
2016-10-25 12:28:07 -07:00
Stephen Birarda
b753871fc1
don't change DF or buffer sizes for ice-server
2016-10-25 11:20:10 -07:00
Brad Hefta-Gaub
1bbf0179dd
Merge pull request #8894 from ZappoMan/xboxLasers
...
Adds support for "lasers" to the Oculus+xbox controller
2016-10-25 09:18:00 -07:00
Brad Hefta-Gaub
da0d1f1f13
Merge pull request #8896 from ZappoMan/i5SandboxHeartbeat
...
actually make the RunningMarker run on a different thread
2016-10-25 08:47:06 -07:00
Brad Hefta-Gaub
4cb693315f
CR feedback
2016-10-25 08:31:23 -07:00
Chris Collins
9846614468
Merge pull request #8879 from AndrewMeadows/show-physics-stats
...
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
sam
6b2b68e691
trying to add counters for the default FBO
2016-10-25 03:36:23 -07:00
Brad Hefta-Gaub
2c28316e39
CR feedback
2016-10-24 20:40:43 -07:00
Brad Hefta-Gaub
ed4279783d
CR feedback
2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
62f63f32a7
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 20:24:29 -07:00
Brad Hefta-Gaub
ae6022c498
actually make the RunningMarker run on a different thread
2016-10-24 18:55:25 -07:00
samcake
58b81e3b0c
Adding counter for the amount of memory used in texture for Framebuffers
2016-10-24 18:34:16 -07:00
Clément Brisset
dd45500313
Merge pull request #8891 from huffman/fix/disconnected-dialog-updates
...
Fix several aspects of the "disconnected" dialog
2016-10-24 15:39:16 -07:00
Chris Collins
48215009c1
Merge pull request #8885 from jherico/qml_limit
...
4k display & QML Offscreen rendering fixes
2016-10-24 15:22:33 -07:00
Brad Hefta-Gaub
779f326452
cleanup
2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e
gak
2016-10-24 14:47:10 -07:00
Ryan Huffman
e0c109d6ca
Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired
2016-10-24 14:45:41 -07:00
Brad Davis
7900fd3e18
New texture memory scheme
2016-10-24 13:10:41 -07:00
Brad Davis
da9eb0433c
Remove workaround for QML HDPI offscreen rendering bug
2016-10-24 11:51:40 -07:00
Ryan Huffman
5b58e8ae97
Fix ConnectionHandler not handling connected-but-need-auth condition
2016-10-24 10:44:33 -07:00
Brad Hefta-Gaub
0f8967970a
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546
more work on extra lasers
2016-10-24 07:46:04 -07:00
Ryan Huffman
b5881146df
Merge pull request #8878 from zzmp/fix/half-sec-audio-crash
...
reduce sound from crashed avatars
2016-10-23 20:38:35 -07:00
Brad Davis
861b69aa94
Add free GPU memory to the displayed stats
2016-10-23 13:07:38 -07:00
Brad Davis
7879bf37f2
Fix typo in comment
2016-10-22 18:12:40 -07:00
Brad Davis
b572fb2a91
Only use sparse texture memory for the memory pressure calculation (since that's all we can modify)
2016-10-22 14:49:10 -07:00
Brad Davis
62de2af944
Add more GPU stats, make stats easier to read
2016-10-22 14:38:46 -07:00
