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
David Kelly
86e01bbae6
First cut
...
Started with the horrible screaming when avatar goes away, seems
due to not putting a codec string in the packets. This was an existing
issue, not due to recent changes. Also, some weird indenting was
fixed, etc... Still hear an artifact when audio starts, but only when
a codec was negotiated. Hoping to fix that too.
2016-10-24 15:18:29 -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
howard-stearns
963fd68cd9
remove backwards compatability
2016-10-24 11:06:32 -07:00
Atlante45
b0a22599e7
Make log global
2016-10-24 10:58:21 -07:00
Atlante45
b2e68a1075
Print log to file as well
2016-10-24 10:58:21 -07:00
Ryan Huffman
e7023b3d99
Add ConnectionFaiureDialog qml
2016-10-24 10:52:46 -07:00
Ryan Huffman
5b58e8ae97
Fix ConnectionHandler not handling connected-but-need-auth condition
2016-10-24 10:44:33 -07:00
howard-stearns
4c4ec37eb3
add home portal entity script and make it go to correct welcome
2016-10-24 10:28:32 -07:00
Ryan Huffman
84bcefc147
Update ConnectionMonitor to increase timeout on startup
2016-10-24 10:28:13 -07:00
Ryan Huffman
32b5c84bec
Update ConnectionMonitor to init at end of startup
2016-10-24 10:27:27 -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 Hefta-Gaub
8efa394bfa
Merge pull request #8886 from jherico/more_gpu_stats
...
Add free GPU memory to the displayed stats
2016-10-23 20:33:15 -07:00
Brad Davis
861b69aa94
Add free GPU memory to the displayed stats
2016-10-23 13:07:38 -07:00
Brad Hefta-Gaub
d5e4c67b02
Merge pull request #8884 from jherico/more_gpu_stats
...
Add more GPU stats, make stats easier to read
2016-10-22 21:51:58 -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
Brad Hefta-Gaub
ee1f3ac38c
Merge pull request #8881 from jherico/offscreen_texture_memory_stats
...
Report offscreen texture memory usage in stats
2016-10-21 19:15:59 -07:00
Ryan Downe Karpf
f5a116fc92
Merge pull request #8880 from hyperlogic/feature/controller-display
...
Show hand controllers in away.js
2016-10-21 17:43:52 -07:00
Brad Hefta-Gaub
61eb9711ed
Merge pull request #8882 from davidkelly/dk/2006
...
Heartbeats need to happen while waiting for sandbox
2016-10-21 17:39:23 -07:00
Brad Davis
e9ac110072
Correct mip calculation
2016-10-21 17:05:56 -07:00
Zach Pomerantz
3bea1069f2
fix unit conversion for audio fade factor
2016-10-21 16:10:33 -07:00
David Kelly
bdcb58bf8b
Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1
...
fix some data-races in logging system
2016-10-21 15:33:40 -07:00
David Kelly
56c11a655a
Merge pull request #8877 from sethalves/fix-ACs
...
undo bad script-engine AC change
2016-10-21 15:25:35 -07:00
Anthony J. Thibault
84d7eef4ba
Remove atp-extract.py
2016-10-21 15:22:16 -07:00
Anthony J. Thibault
ae301602e7
Fix for incorrect tip texture URLs.
2016-10-21 14:49:46 -07:00
David Kelly
aa31d3d8cc
Heartbeats need to happen while waiting for sandbox
...
We can only know if sandbox is up by waiting for the http request to
succeed or fail. In the common case (fail since it isn't up yet), we
have to wait until a connect timeout in http. Seems that is a couple
seconds, and in that time we really upset the deadlock watchdog thread
since it keeps a moving average of heartbeat times.
Simple solution, updateHeartbeat while waiting, and right before we
start.
2016-10-21 14:43:39 -07:00
