Commit graph

19708 commits

Author SHA1 Message Date
samcake
ce89f811f3 better loggin of the sparse switch 2016-11-03 14:35:44 -07:00
samcake
4104aa6286 avoid warning? 2016-11-03 14:31:28 -07:00
samcake
6a39ad3b5a Prevent sparse texture on AMD gpus for now 2016-11-03 13:01:41 -07:00
samcake
96bdeebc37 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-11-02 12:30:45 -07:00
samcake
3c777bb079 Clenaing up the detection phase to get all the iformation from DXGI 2016-11-02 12:29:51 -07:00
Brad Hefta-Gaub
56b3ac8c89 Merge pull request #8972 from sethalves/fix-for-2159
lock around audio-client quit flag to avoid shutdown race
2016-11-02 00:14:33 -07:00
samcake
49f1590e01 Start detecting all the gpus 2016-11-01 16:51:57 -07:00
Anthony Thibault
a9c88f2383 Merge pull request #8957 from AndrewMeadows/dont-mirror-eyes
fix broken eyes in mirrored animations
2016-11-01 15:28:48 -07:00
Seth Alves
137730dc50 coding standard 2016-11-01 11:59:28 -07:00
Seth Alves
ae17135a07 lock around quit flag to avoid shutdown race 2016-11-01 11:14:16 -07:00
samcake
861944ba71 Try uing DXGI on windows instead of com 2016-11-01 11:12:47 -07:00
Anthony J. Thibault
09511111cf Load plugins in alphabetical order. 2016-11-01 10:23:54 -07:00
samcake
a23bbd1e4e Trying to extend the memory counter 2016-10-31 16:40:15 -07:00
Chris Collins
a49669a975 Merge pull request #8955 from sethalves/fix-obj-textures
fix obj textures
2016-10-31 11:52:25 -07:00
Chris Collins
0520aa9ad5 Merge pull request #8948 from samcake/blue
Avoid messaging for render targets generating mip maps
2016-10-31 11:09:06 -07:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket
group udt::Socket errors as debug logs
2016-10-31 10:31:10 -07:00
Andrew Meadows
c8d4146351 don't mirror eye animations 2016-10-28 17:08:43 -07:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Clément Brisset
95c175ae74 Merge pull request #8950 from huffman/tutorial/gotoentrystep
Add tutorial tracking for going through the welcome portal
2016-10-28 16:26:40 -07:00
Chris Collins
1ba5a5d5d7 Merge pull request #8947 from huffman/fix/script-include-race
Fix race condition in BatchLoader
2016-10-28 16:17:46 -07:00
Seth Alves
43536e0046 in C, order of argument evaluation isn't defined 2016-10-28 15:48:54 -07:00
Chris Collins
d9d9119dcb Merge pull request #8951 from zzmp/fix/crash-on-web-wasapi
fix crash on shutdown from web audio captures
2016-10-28 15:23:39 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Ryan Huffman
dd1a23ea01 Add Script.generateUUID 2016-10-28 13:42:03 -07:00
Ryan Huffman
9a99cd0ec6 Add tutorialID and tutorialVersion to tutorial progress event 2016-10-28 12:53:16 -07:00
Ryan Huffman
52c74f776c Fix race condition in BatchLoader 2016-10-28 11:40:50 -07:00
samcake
c21fe00cfc Avoid messaging for render targets 2016-10-28 11:40:10 -07:00
Seth Alves
e15043754c Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 11:36:09 -07:00
Stephen Birarda
7ddfddc567 make the socket readyRead check fire after 2s of no packets 2016-10-28 10:30:20 -07:00
Stephen Birarda
20f042a15a add slightly more information to last packet debug in Socket 2016-10-27 22:10:32 -07:00
Stephen Birarda
db7f5724f7 output last seq number and last socket before readyRead sticks 2016-10-27 21:50:29 -07:00
Brad Hefta-Gaub
97f622f003 Merge pull request #8940 from hyperlogic/bug-fix/web-engine-crash-when-swiching-domains
Fix for crash in QtWebEngineCore when rapidly switching domains
2016-10-27 20:01:31 -07:00
Anthony J. Thibault
1fc310434e Fix for crash in QtWebEngineCore when rapidly switching domains
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
Howard Stearns
d2b83b47ba Merge pull request #8936 from zzmp/clean/audio-mixer
clean audio mixer
2016-10-27 15:57:16 -07:00
Zach Pomerantz
428bb8e518 rm unused OffscreenQmlSurface const 2016-10-27 14:40:51 -07:00
Brad Davis
012e215f62 Merge pull request #8922 from ZappoMan/report45hzTarget
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
2016-10-27 14:03:07 -07:00
Zach Pomerantz
72282257bd group udt::Socket errors as debug logs 2016-10-27 13:45:58 -07:00
Brad Hefta-Gaub
bfe6ebb44f some tweaks 2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
510786bc0f Merge pull request #8923 from Atlante45/steamvr
Add getter for SteamVR's buildID to SteamClient
2016-10-27 11:38:35 -07:00
Chris Collins
e7ea30b1cc Merge pull request #8924 from huffman/fix/batch-loader-race
Fix race condition in BatchLoader
2016-10-27 11:04:24 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Ryan Huffman
946f3782f3 Fix indentation in BatchLoader 2016-10-27 09:59:17 -07:00
Stephen Birarda
4abc4adde9 add a timer to check for readyRead backup 2016-10-26 16:18:12 -07:00
Ryan Huffman
10e6157ab9 Fix race condition in BatchLoader 2016-10-26 15:16:29 -07:00
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