Commit graph

32644 commits

Author SHA1 Message Date
Roxanne Skelly
071a779930 convert enum reason for disconnect to boolean 2019-06-11 14:38:39 -07:00
Roxanne Skelly
8a3672f3c5 Checkpoint MTBF uptime reporting 2019-06-11 12:41:45 -07:00
Shannon Romano
04d707dbe0
Merge pull request #15723 from sethalves/zero-size-grid-asan
BUGZ-627: don't divide by zero if a grid entity-item has a zero dimension
2019-06-10 16:54:03 -07:00
Anthony J. Thibault
654b5775e1 Crash fix for ResourceCache::getResource()
A wrong 'read' locker is used around a critical section that actually modifies the _resources QHash.
This can result in memory corruption and seg faults.
2019-06-10 15:05:34 -07:00
Seth Alves
67995a8677 don't divide by zero if a grid entity-item has a zero dimension 2019-06-10 14:25:44 -07:00
Shannon Romano
1748d0527f
Merge pull request #15698 from samcake/nut
BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target
2019-06-10 13:10:56 -07:00
Shannon Romano
1982424ee9
Merge pull request #15719 from SamGondelman/crash
BUGZ-545: Possible fix for Mac PolyLine-related crash
2019-06-10 12:56:31 -07:00
Roxanne Skelly
4a89d22482
Merge pull request #15694 from roxanneskelly/bugz516
BUGZ-516 - attempt to rebind bound sockets on silent domain checkin
2019-06-10 12:30:23 -07:00
SamGondelman
23f8778feb possible fix for mac crash? 2019-06-10 11:10:29 -07:00
Sam Gateau
32399997b1 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-10 10:52:53 -07:00
Shannon Romano
d8791c4379
Merge pull request #15710 from SamGondelman/lightmap
BUGZ-596: Fix baking of light maps
2019-06-10 10:13:55 -07:00
Sam Gateau
e0714e5b1a Removing comments 2019-06-07 17:18:30 -07:00
Sam Gateau
2d9a7f7c4f Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware 2019-06-07 17:00:37 -07:00
Roxanne Skelly
ec1118db1f Attempting to write to a socket in unbound state was causing qt to crash
after a number of tries.  This fix does an initial check to prevent that
case.
2019-06-07 15:23:06 -07:00
SamGondelman
129d96a997 get rid of lightmapMap 2019-06-07 14:53:31 -07:00
Roxanne Skelly
6643633400 Move rebind on network error to rebind on silent domain checkin 2019-06-07 13:38:50 -07:00
PrestonB1123
73ce5ef619
Merge pull request #15695 from PrestonB1123/logspam
BUGZ-346: QML Logspam
2019-06-07 13:37:38 -07:00
Shannon Romano
8d8c7c1a10
Merge pull request #15555 from raveenajain/gltf_walkingBounding
Case 22352: gltf walking, bounding, collision
2019-06-07 12:23:52 -07:00
Shannon Romano
96a9092847
Merge pull request #15706 from sabrina-shanman/bug_avatar_res-state
(BUGZ-429) Fix stuck transition due to removing sub render items before parent
2019-06-07 12:23:15 -07:00
Preston Bezos
27de181d0c Merge branch 'master' of github.com:highfidelity/hifi into logspam 2019-06-07 11:54:48 -07:00
sabrina-shanman
21966fe345 Fix stuck transition due to removing sub render items before parent 2019-06-07 11:14:32 -07:00
Seth Alves
54906a270e don't hang if somehow setting display plugin to the current one 2019-06-07 10:31:48 -07:00
Sam Gateau
07ddc535a0 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-07 09:32:50 -07:00
Sam Gateau
76836ebe9f Exposing a lot more details about displays on mac 2019-06-07 09:32:26 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state
(BUGZ-559) Improve transition debugging and transition clean-up
2019-06-06 16:35:04 -07:00
sabrina-shanman
9a75feecde Fix binding to temporary transitionStage pointer 2019-06-06 14:52:42 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00
Roxanne Skelly
d0bd4a7d47 try rebinding on error writing/reading from bound socket 2019-06-06 14:01:34 -07:00
sabrina-shanman
971d563f49 Add debug icons for transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
faf5db5476 Change semantic for removing transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
sabrina-shanman
5587193640 Add more transition icon debugging 2019-06-06 13:25:00 -07:00
Roxanne Skelly
a55c723842 remove spammy logging 2019-06-06 11:03:50 -07:00
jennaingersoll
677b54e240
Merge pull request #15684 from ctrlaltdavid/DOC-78
DOC-78: Polish Vec3 JSDoc
2019-06-05 16:26:32 -07:00
Roxanne Skelly
b8d6c57483
Merge pull request #15677 from roxanneskelly/bugz516
Log socket error string when socket error happens
2019-06-05 15:50:15 -07:00
David Rowe
42cb3d9828 Polish Vec3 API JSDoc 2019-06-06 10:26:43 +12:00
Shannon Romano
a3d3190813
Merge pull request #15678 from ctrlaltdavid/DOC-75
DOC-75: Polish Users JSDoc
2019-06-05 14:20:19 -07:00
Roxanne Skelly
2f2e967a92 log windows socket error code on socket error 2019-06-05 14:08:26 -07:00
David Rowe
eac7d298dc Change "privacy bubble" to "privacy shield" 2019-06-06 08:21:22 +12:00
Roxanne Skelly
04f879be3e Add additional logging on socket send error 2019-06-05 12:41:08 -07:00
Roxanne Skelly
9fb43b4930 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-05 11:08:26 -07:00
Roxanne Skelly
06ed751f56 checkpoint to deal with merge 2019-06-05 11:08:12 -07:00
jennaingersoll
dc16b678d8
Merge pull request #15679 from ctrlaltdavid/DOC-76
DOC-76: Polish Uuid JSDoc
2019-06-05 10:17:32 -07:00
Ken Cooke
a132dad486 On platforms where nativeFormatForAudioDevice() is reliable, do not enumerate formats 2019-06-05 07:03:18 -07:00
David Rowe
42c0362303 Fix link 2019-06-05 15:14:05 +12:00
David Rowe
ef56cba71b Polish Uuid API JSDoc 2019-06-05 14:39:27 +12:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
Shannon Romano
c48ecb5f67
Merge pull request #15674 from sethalves/quiet-some-warnings
Quiet some warnings
2019-06-04 17:00:54 -07:00
David Rowe
0bdca38644 Polish Users JSDoc 2019-06-05 11:46:14 +12:00
Seth Alves
02ff4ea2f5 add some comments to help future devs 2019-06-04 15:45:33 -07:00