Commit graph

29250 commits

Author SHA1 Message Date
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
jennaingersoll
712167c623
Merge pull request #15476 from ctrlaltdavid/M22407
Case 22407: Quat JSDoc update
2019-05-13 15:17:58 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state
(BUGZ-40) Check for possible avatar fade race condition
2019-05-13 13:41:09 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2
case 22190: Disable triggering away state when interface focus lost
2019-05-13 13:22:28 -07:00
Shannon Romano
8aee64c102
Merge pull request #15540 from jherico/fix/gl_crash
BUGZ-125: Error message instead of crash if the GL version is too low
2019-05-13 13:12:30 -07:00
Shannon Romano
46d75a61b3
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change
Clear any reliable connection state upon Node ID change
2019-05-13 13:11:05 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch
Case 22379: Run-time switch for deferred/forward rendering
2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
sabrina-shanman
736c7a9736 Change logging from 'fade-out animation' to 'fade-out transition' 2019-05-10 15:18:52 -07:00
sabrina-shanman
6f5bf01f2b Add sanity check and logging for possible avatar fade lambda race condition 2019-05-10 14:33:25 -07:00
Shannon Romano
5c9570cffb
Merge pull request #15539 from jherico/fix/watchdog_spam
BUGZ-131: Reduce spam from watchdog thread
2019-05-10 14:24:15 -07:00
Simon Walton
4b51d81b42 Clear any reliable connection state upon Node ID change 2019-05-10 12:06:38 -07:00
Brad Davis
0f8ddae9df Reduce spam from watchdog thread 2019-05-10 12:01:07 -07:00
Shannon Romano
0d28932181
Merge pull request #15529 from Atlante45/feat/more-ice-logging
Add instrumentation to help track down connection issues
2019-05-10 11:57:24 -07:00
Brad Davis
db88f14e13 Error message instead of crash if the GL version is too low 2019-05-10 11:51:50 -07:00
Clement
0a7352074c Fix android build 2019-05-09 17:17:43 -07:00
Shannon Romano
930032bcc6
Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop
case 22166: Build complex shapes in ThreadPool instead of MainLoop
2019-05-09 17:14:50 -07:00
Shannon Romano
6aa8dc7c42
Merge pull request #15534 from kencooke/audio-PTT-output-ducking
Reduce echo when push-to-talk is used
2019-05-09 15:54:15 -07:00
Andrew Meadows
a0b34e4f15 more correct clearing of dirty flags for AvatarMotionState 2019-05-09 14:45:36 -07:00
Andrew Meadows
c7432ffe5f also update easy flags when rebuilding avatar shape 2019-05-09 13:48:07 -07:00
Ken Cooke
1b733d3fb3 While PTT is active, duck the audio output by 20dB to reduce echo 2019-05-09 12:56:07 -07:00
SamGondelman
59e7db2d6b Merge remote-tracking branch 'upstream/master' into switch 2019-05-09 11:42:05 -07:00
danteruiz
0fae615cb4 fix dock widget context 2019-05-09 09:20:50 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
Anthony Thibault
4ee39355f1
Merge pull request #15525 from hyperlogic/feature/backtrace-gpu-ident
Add gpu_name, gpu_driver & gpu_memory to crash annotations
2019-05-08 16:09:13 -07:00
Anthony Thibault
78403e4436 Add gpu_name, gpu_driver & gpu_memory to crash annotations
This may help us identify the hardware causing early gl initialization errors.
2019-05-08 13:33:45 -07:00
Shannon Romano
15484436ca
Merge pull request #15507 from danteruiz/dockable-windows
case LILY-30: Dockable Interactive Windows
2019-05-08 12:16:04 -07:00
danteruiz
3806631bf1 dockable window 2019-05-08 10:04:31 -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
Andrew Meadows
f6916edac4 cleanup and removing some accidental C++-20-isms 2019-05-06 17:37:35 -07:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 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
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
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
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
Ken Cooke
ea9690d72b Disable MIDI rescan after devicechange, to avoid deadlock 2019-05-06 10:46:54 -07:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
Avatar verification
2019-05-06 08:04:06 -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
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
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
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
Sam Gateau
02530bdd02 Refining the test to resetInactiveTimer 2019-05-02 14:51:45 -07:00
David Kelly
0b2d11aeef Merge branch 'master' of github.com:highfidelity/hifi into dk/bugz-6 2019-05-02 12:37:16 -07:00
Wayne Chen
d31ed9ac22 adding timer for muted warning 2019-05-02 12:23:58 -07:00
Shannon Romano
caefa3e06a
Merge pull request #15362 from ctrlaltdavid/M22075
Case 22075: Controller JSDoc update
2019-05-02 11:34:58 -07:00