Commit graph

30413 commits

Author SHA1 Message Date
milad
c6f7c058bc merging master 2019-11-05 17:30:09 -08:00
Zach Fox
e1b02fb73a The same message as the last commit, except do the work this time 2019-11-01 13:23:25 -07:00
Zach Fox
9273db4844 Fix an issue that prevented new screenshare scripts from running properly 2019-11-01 13:03:16 -07:00
milad
d9d9877f83 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-01 10:53:03 -07:00
milad
f2e49cb553 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-01 10:52:46 -07:00
milad
1b3367fcf9 logging ids 2019-11-01 10:51:23 -07:00
Anthony J. Thibault
4b34311a0a Hooked up seated version of aim offset animation 2019-10-31 16:23:29 -07:00
MiladNazeri
676e7bd5b8
Merge branch 'master' into screenshareElectronApp 2019-10-31 13:11:56 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Zach Fox
68819addd5 Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards 2019-10-31 11:29:46 -07:00
Zach Fox
a336a71db9 Add necessary include 2019-10-31 10:39:04 -07:00
Zach Fox
47b3fdbfe3 Stop screenshare process on interface shutdown 2019-10-31 10:01:00 -07:00
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new
case DEV-2771: Audio client shutdown lock
2019-10-31 09:50:56 -07:00
Zach Fox
d8026304a4 Guard against a crash in stopScreenshare() 2019-10-31 09:47:31 -07:00
Zach Fox
1e2fcf8bd5 Add screenshareStopped signal; use std::unique_ptr<QProcess> 2019-10-31 09:43:56 -07:00
Zach Fox
c22f5097c0 Make SCREENSHARE_EXE_PATH private 2019-10-31 09:24:28 -07:00
Zach Fox
6291590737 Fixup paths 2019-10-31 09:01:02 -07:00
Zach Fox
1e24df3f71 Get Interface to look in the proper directories 2019-10-31 08:57:06 -07:00
amerhifi
52e0f54d0c addressing comments 2019-10-31 07:21:16 -07:00
milad
ea373ac14c First steps towards a screenshare app 2019-10-30 16:44:42 -07:00
amer cerkic
4b4b722875 fixed issues related to context switching and selection with hmd 2019-10-30 16:27:19 -07:00
Shannon Romano
8d6434fbca
Merge pull request #16367 from ctrlaltdavid/DOC-199
DOC-199: AudioScope JSDoc
2019-10-30 13:45:13 -07:00
amer cerkic
39e1092660 working on hmd fix 2019-10-30 11:34:41 -07:00
Shannon Romano
9948a181dc
Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton
In Bookmarks, attach avatar entities after the skeleton is loaded
2019-10-30 09:29:51 -07:00
Shannon Romano
2b25dd30d2
Merge pull request #16424 from RebeccaStankus/consoleText
Specified color on text edit for console
2019-10-30 09:15:27 -07:00
Oren Hurvitz
7953e3889f Wait for the avatar skeleton to finish loading before adding the avatar entities 2019-10-30 12:12:26 +02:00
Rebecca Stankus
9c0003515a Specified color on text edit for console 2019-10-29 15:46:16 -07:00
amerhifi
ddfbb55e19 fixed old ui filtering of audio devices 2019-10-29 15:36:43 -07:00
Shannon Romano
8fc135d972
Merge pull request #16423 from hyperlogic/bug-fix/third-person-look-at-fix-2
DEV-2302: Fix for head not turning in third person look at camera mode
2019-10-29 13:41:13 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed
Fixed the sprint speeds of Desktop vs HMD
2019-10-29 13:04:45 -07:00
Anthony Thibault
4341da03c5
Merge pull request #16419 from luiscuenca/lookAtFixes
DEV-2285: Fix look at update and allow to release control
2019-10-29 12:56:22 -07:00
Anthony J. Thibault
e753010411 Fix for head not turning in third person look at camera mode
If MyAvatar::setSkeletonModelURL() is called with the same url that has already been loaded the
SkeletonModel::skeletonLoaded signal will not be triggered.  In this case the MyAvatar local variable
MyAvatar::_skeletonModelLoaded will be set to false and never re-set to true.  This, in turn,
caused MyAvatar::updateHeadLookAt() to skip setting the proper blend values that would turn the head.

Rather then try to make MyAvatar::_skeletonModelLoaded handle all the possible edge cases. It has
been removed.  All conditionals that used to use it have been replased with _skeletonModel->isLoaded().
2019-10-29 12:38:06 -07:00
amerhifi
7d5dcbfc77 space cleanup 2019-10-29 11:58:04 -07:00
Rebecca Stankus
b8d6a2cf0b Added extra attempt to parent interactive window content on creation 2019-10-29 11:20:14 -07:00
amerhifi
884cbd7de9 working on moving display plugin lookup to audiodevices 2019-10-29 09:26:48 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control 2019-10-28 17:51:29 -07:00
Zach Fox
bda1e3f696
Merge pull request #16398 from RebeccaStankus/grayEmoteWindow
Gray emote window
2019-10-28 11:37:17 -07:00
Oren Hurvitz
70c3bb2748 Emit an event when failing to load an avatar.
Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded.
Now it also emits an event (onLoadFailed) if the load failed.
2019-10-27 10:55:31 +02:00
Oren Hurvitz
62e5b50e24 Fixed the sprint speeds of Desktop vs HMD (they were flipped) 2019-10-27 09:33:59 +02:00
Anthony J. Thibault
9325ea588a Re-added removed jsdoc comments for removed AvatarInput jsapi.
With a comment that these properties/functions have been removed.
2019-10-26 09:20:51 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re
case Dev 471: HMD default audio behavior
2019-10-24 16:23:14 -07:00
Shannon Romano
15f27e53cb
Merge pull request #16372 from ctrlaltdavid/DEV-2055
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
2019-10-24 15:20:34 -07:00
Rebecca Stankus
9a8fda2705 Feedback changes 2019-10-24 12:07:34 -07:00
Rebecca Stankus
f8102be74d Added a timeout to update the content holder parent after interactive window has finished loading 2019-10-24 12:07:25 -07:00
Rebecca Stankus
8e8c157567 Debugging stuff 2019-10-24 12:07:20 -07:00
Rebecca Stankus
83a6155592 Added tons of logging to debug interactive window 2019-10-24 12:06:49 -07:00
Anthony J. Thibault
dc7b611e8e documentation and warning fixes 2019-10-24 09:53:11 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI
DEV-2285: Improve eyes look at
2019-10-23 20:42:27 -07:00
Anthony J. Thibault
f28d317914 Clean up reamining issues 2019-10-23 16:43:10 -07:00