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
Ryan Huffman
cc3a1d8c67
Update home content set
2016-10-25 13:54:16 -07:00
samcake
133b0b38fd
Fixing build issue on non win
2016-10-25 13:24:39 -07:00
Ryan Downe Karpf
7a4302057a
Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip
...
Update vive controller display to not hide on equip
2016-10-25 13:16:31 -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
David Kelly
b09364c288
whitespace
2016-10-25 12:22:26 -07:00
David Kelly
30d8f1967c
Flushing encoder
...
Seems they have some state. So if you play a sound, then silence
that doesn't go through the encoder (SilentAudioFrame), then a
sound again, you will hear a click. Now, I just pop a frame of
0s through the encoder at the end of each .wav it plays. Poof!
2016-10-25 12:15:48 -07:00
Brad Hefta-Gaub
2b2b55aab0
Merge pull request #8902 from birarda/walking-dead
...
don't change DF or buffer sizes for ice-server
2016-10-25 11:45:48 -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
Ryan Huffman
af749605ea
Update vive controller display to not hide on equip
2016-10-25 08:27:20 -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
David Rowe
34b9d3eecc
Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes
2016-10-25 20:25:34 +13:00
Chris Collins
325cd0ae61
Merge pull request #8870 from ctrlaltdavid/21084
...
Reinstate "reload" button for entity scripts in entities editor
2016-10-24 22:17:14 -07:00