Commit graph

78433 commits

Author SHA1 Message Date
Andrew Meadows
6e27b4d1c5 remove bodies of deleted entities 2019-05-06 17:37:35 -07:00
Andrew Meadows
af1f4364ef don't forget to add detailedMotionStates to simulation 2019-05-06 17:37:35 -07:00
Andrew Meadows
a0841c937c fix logic around updating off-thread shapes 2019-05-06 17:37:35 -07:00
Andrew Meadows
915cbb69df split work out of EntityTree::update(), call it preUpdate() 2019-05-06 17:37:35 -07:00
Andrew Meadows
3eed8218ca overhaul of MotionState and shape creations 2019-05-06 17:37:35 -07:00
Andrew Meadows
3c8c68d187 track EntityItem adds to physcis with pending shape 2019-05-06 17:35:57 -07:00
Andrew Meadows
deee159892 unravel physics-vs-entities lib dependencies part 1 2019-05-06 17:35:57 -07:00
Andrew Meadows
7dfa8a26a3 cleanup EntityItem::shouldBePhysical() and derivations 2019-05-06 17:35:57 -07:00
Andrew Meadows
8445eaf310 protect against orphaned off-thread-assembled shapes 2019-05-06 17:35:57 -07:00
Andrew Meadows
514d598797 remove unhelpful profiling with wrong category 2019-05-06 17:35:57 -07:00
Andrew Meadows
fbd4db5505 build StaticMeshShapes outside of mainloop 2019-05-06 17:35:57 -07:00
Andrew Meadows
7fb7e503f9 reduce footprint of ShapeManager::_shapeMap 2019-05-06 17:35:57 -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
Zach Fox
d53b528994 Some fixes - i don't think this code is complete 2019-05-06 13:38:09 -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
Zach Fox
6033058d54 Comment 2019-05-06 11:51:59 -07:00
Zach Fox
1c9a4fd322 Fix build error 2019-05-06 11:37:15 -07:00
Zach Fox
2046fcfd09 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-06 11:08:36 -07:00
Zach Fox
a68da2bca7 Finish out the feature, i think 2019-05-06 11:08:23 -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
Zach Fox
d0e5087b20 Add permission 2019-05-06 10:19:58 -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
David Rowe
9c12a39368 Merge branch 'master' into M22147 2019-05-06 11:28:22 +12:00
David Rowe
dfa5d2ddf1 InteractiveWindow QML messaging example 2019-05-06 11:23:30 +12:00
David Rowe
2d5bf4f940 InteractiveWindow JSDoc 2019-05-06 10:27:24 +12:00
David Rowe
7183d10879 Desktop JSDoc 2019-05-06 10:26:16 +12: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
unknown
0da318f2cd fix material target tooltip 2019-05-03 10:37:35 -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