Commit graph

78198 commits

Author SHA1 Message Date
amerhifi
d019dc7d54 typo 2019-05-10 15:31:11 -07:00
amerhifi
81c0d195e3 added ability to extract cpu info on osx 2019-05-10 15:17:33 -07:00
amerhifi
684d71fc5b more clean up 2019-05-10 12:27:10 -07:00
amerhifi
0e6fcf0fe6 removed unecessary using 2019-05-10 12:24:41 -07:00
amerhifi
ba69f0c962 cleaned up references and added json alias. Unfortuantely this library isn't easy to forward declare so leaving the header include 2019-05-10 12:21:40 -07:00
amerhifi
edb3206a24 adding macos platform. Misisng display and cpu info 2019-05-10 09:55:26 -07:00
amerhifi
b998008f01 fixed typo 2019-05-09 14:43:27 -07:00
amerhifi
8b1cdb03cc new mac os stubs 2019-05-09 14:35:05 -07:00
amerhifi
0d97543ece code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform 2019-05-09 12:04:41 -07:00
amerhifi
58cff374d7 merged master 2019-05-08 08:53:19 -07:00
Shannon Romano
3877a359fd
Merge pull request #15519 from hyperlogic/bug-fix/master-shared-object-deadlock
SharedObject::onRender deadlock fix
2019-05-07 11:54:17 -07:00
Shannon Romano
a89a65b810
Merge pull request #15517 from jherico/fix/tbb_overhead
Case 22483: Disable the use of tbb::parallel_for in Blender
2019-05-07 11:49:15 -07:00
Brad Davis
17632e3c50 PR feedback 2019-05-07 10:36:14 -07:00
Shannon Romano
e90f91f109
Merge pull request #15488 from sethalves/fix-indep-camera
case 22412: allow independent camera to be set by scripts

👍 by QL for pre-merge testing in the manu ticket
2019-05-07 09:38:54 -07:00
Brad Davis
2b1267ffeb Disable the use of tbb::parallel_for in Blender 2019-05-06 16:53:37 -07:00
Anthony J. Thibault
c33ad93a55 SharedObject::onRender deadlock fix
Call gl::globalRelease() for paused surfaces, this fixes a very common deadlock on mac.

But for PC, by inspection, a race condition could occur over the _syncRequested boolean, between the main and qml rendering thread.
To fix this, we split render and renderSync into separate messages.
2019-05-06 16:19:30 -07:00
amer cerkic
f557e58224 working on dxgi gpu info stuff 2019-05-06 16:16:20 -07:00
Shannon Romano
86f562de1b
Merge pull request #15515 from kencooke/midi-devicechange-audio-deadlock
Case 20521: Unplugging headphones with hifi open causes freeze
2019-05-06 15:03:56 -07:00
Shannon Romano
5a603c20aa
Merge pull request #15495 from Atlante45/fix/deadlock
Case 22433: master: Query shape type outside lock
2019-05-06 14:12:56 -07:00
Wayne Chen
845ad38106
Merge pull request #15503 from wayne-chen/useThresholdMutedWarning
Case 22447: The "MUTED" indicator (which warns when talking while muted) constantly flickers
2019-05-06 13:55:59 -07:00
amer cerkic
26b38f5950 ifndef protection for headers 2019-05-06 13:51:52 -07:00
Shannon Romano
1636256068
Merge pull request #15496 from davidkelly/dk/bugz-6
Increase max heartbeat time to 10 sec on mac
2019-05-06 13:03:25 -07:00
Brad Davis
2886e94cdc Fix VS2019 build failure 2019-05-06 12:44:53 -07:00
Shannon Romano
d206c9c87f
Merge pull request #15490 from raveenajain/stuckAvatars
Case 22424: gltf avatars break all other available avatars when used
2019-05-06 12:39:43 -07:00
amer cerkic
8273e5b666 fixing stuff based on comments and feedback from Sam. willc reate template for some of the getters since its the same old 2019-05-06 12:27:46 -07:00
John Conklin II
668af7c4a3
Merge pull request #15433 from Atlante45/fix/osx-deploy-target
Dependencies have correct osx deploy target
2019-05-06 12:15:18 -07:00
Ken Cooke
408fb56d57 MIDI error checking 2019-05-06 10:53:58 -07:00
Ken Cooke
f133ab65e4 MIDI bugfix 2019-05-06 10:48:53 -07:00
Ken Cooke
ea9690d72b Disable MIDI rescan after devicechange, to avoid deadlock 2019-05-06 10:46:54 -07:00
amer cerkic
cadcb8b7c3 Merge branch 'master' into feature/platform 2019-05-06 10:37:14 -07:00
Shannon Romano
3515c13e32
Merge pull request #15497 from sabrina-shanman/crash_fbx_read-binary-array
(case 22429) Do sanity checks on FBX data array lengths
2019-05-06 08:07:35 -07:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
Avatar verification
2019-05-06 08:04:06 -07:00
Shannon Romano
827cab7f1b
Merge pull request #15483 from SimonWalton-HiFi/set-connection-rate-high
22431: Set default avatar-mixer connection rate to effectively unlimited
2019-05-06 08:01:57 -07:00
amerhifi
527cf8b3d3 adding cpu and memory as well as json serialization with the 3rd party library 2019-05-03 15:57:45 -07:00
Shannon Romano
2618ad09c3
Merge pull request #15501 from thoys/fix/asyncDailogsExitCrash
BUGZ-73: Fix crash for active async messageBoxes on exit of client
2019-05-03 15:40:48 -07:00
Shannon Romano
0cdde4b5dc
Merge pull request #15422 from ctrlaltdavid/M22224
Case 22224: Midi JSDoc
2019-05-03 15:10:40 -07:00
Sabrina Shanman
3c5bf63c55
Merge pull request #15505 from SamGondelman/stageCrash
Case 22419: Try to fix transition crash
2019-05-03 14:38:42 -07:00
Shannon Romano
74a79d04e7
Merge pull request #15504 from amantley/bugMaxBandwidth
Fixed possible divide by zero error in setPacketSendPeriod()
2019-05-03 09:17:32 -07:00
amerhifi
2762597e6a merged master 2019-05-03 09:12:21 -07:00
John Conklin II
16ece6c2fc
Merge pull request #15493 from amantley/bugPushToTalk
When you unmute using ctrl-m during push to talk, you now see that reflected in the audio icon
2019-05-03 09:03:36 -07:00
David Rowe
95e45a5aff Merge branch 'master' into M22224 2019-05-03 17:07:35 +12:00
David Rowe
8458d746cd Doc review 2019-05-03 17:07:14 +12:00
Angus Antley
1f004f34c4 added check for valid dynamic casts 2019-05-02 21:59:11 -07:00
Angus Antley
f019fa3a7c Merge remote-tracking branch 'upstream/master' into bugPushToTalk 2019-05-02 18:28:34 -07:00
Angus Antley
1911301005 changed to match type of _mss in compare. also changed float to double for correct return type 2019-05-02 18:21:08 -07:00
Sam Gateau
46f4b13f2f
Merge pull request #15499 from samcake/coco
BUGZ-92: Refresh rate Throttling refinements
2019-05-02 17:24:34 -07:00
Shannon Romano
29e415a104
Merge pull request #15498 from SamGondelman/crash
Case 22444: Try to fix materialMapping crash
2019-05-02 16:29:39 -07:00
Shannon Romano
5d3c88b964
Merge pull request #15502 from sabrina-shanman/crash_snapshot_no-directory
(case 22368) Fix snapshots freezing Interface when no snap directory defined
2019-05-02 15:59:25 -07:00
amer cerkic
f09f6ebd08 initial interface setup for platform 2019-05-02 15:50:35 -07:00
Shannon Romano
7fc92a74e0
Merge pull request #15429 from SamGondelman/leave
Case 20989: Call leaveEntity when script on containing entity stops
2019-05-02 15:42:47 -07:00