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 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
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
Chris Collins
ad09ced3f8
Merge pull request #8906 from ZappoMan/improvedStats
...
more detailed stats in user heartbeat
2016-10-25 15:47:07 -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
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
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
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
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
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
Brad Hefta-Gaub
76ca3aa546
fix residual head laser
2016-10-24 15:25:06 -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
Howard Stearns
ab21487a6d
Merge pull request #8890 from howard-stearns/fix-home-portal-destination
...
add home portal entity script and make it go to correct welcome
2016-10-24 14:49:00 -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
Ryan Huffman
bbf5afeb8d
Remove use of start() w/o param in ConnectionMonitor
2016-10-24 14:35:38 -07:00
Ryan Huffman
5077ec2044
Remove unused indicateDomainConnectionFailure
2016-10-24 14:35:09 -07:00
Ryan Huffman
45ae61d551
Merge pull request #8892 from Atlante45/sandbox
...
Sandbox logs to file
2016-10-24 14:31:56 -07:00
Ryan Huffman
f3ef0cebed
Update ConnectionMonitor to not show poopup on domain connection refusal
2016-10-24 14:27:28 -07:00
Brad Hefta-Gaub
8e6bbb3b61
Merge pull request #8874 from jherico/texture_memory_redux
...
New texture memory scheme
2016-10-24 14:22:54 -07:00
Atlante45
812265363c
Reorder object construction
2016-10-24 13:31:54 -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
Atlante45
4661d6e2d1
Move log file to already existing Sandbox directory
2016-10-24 11:24:35 -07:00
Atlante45
143fc644d3
Added some shutdown debug
2016-10-24 11:11:30 -07:00
