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
d5c4b0cd9f
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-10-31 09:45:00 -07:00
Zach Fox
1e2fcf8bd5
Add screenshareStopped signal; use std::unique_ptr<QProcess>
2019-10-31 09:43:56 -07:00
milad
114b9250bf
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-10-31 09:37:08 -07:00
milad
9e3318e5dd
added readme
2019-10-31 09:36:58 -07:00
Zach Fox
c22f5097c0
Make SCREENSHARE_EXE_PATH private
2019-10-31 09:24:28 -07:00
Zach Fox
f8e516efb8
Fix typos from the last commit
2019-10-31 09:14:52 -07:00
Zach Fox
cc9eb31d99
Build in PR builds
2019-10-31 09:11:38 -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
Zach Fox
82c75e9a92
Add packager to package.json
2019-10-30 17:00:30 -07:00
Zach Fox
5af7acf9ba
Revert spooky changes
2019-10-30 16:53:18 -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
faa192a337
Merge pull request #16338 from ctrlaltdavid/DOC-126
...
DOC-126: Toolbars JSDoc
2019-10-30 13:46:16 -07:00
Shannon Romano
161de1478b
Merge pull request #16335 from ctrlaltdavid/DOC-191
...
DOC-191: Recording JSDoc
2019-10-30 13:46:04 -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
Zach Fox
80b93bd43b
Merge pull request #16426 from danteruiz/update-launcher-text
...
Dev-2602: Update Text on new QT Launcher
2019-10-30 10:47:47 -07:00
dante ruiz
d48097ce2c
Make requested changes
2019-10-30 10:41:17 -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
dante ruiz
1a42ad0736
update launcher text
2019-10-30 09:27:37 -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
Shannon Romano
4d001a1040
Merge pull request #16122 from danteruiz/qt-launcher
...
Qt launcher
2019-10-29 17:05:37 -07: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
dante ruiz
d752d95a8d
Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher
2019-10-29 15:22:06 -07:00
dante ruiz
5d69d554f9
fix mac update issues
2019-10-29 15:21:54 -07:00
danteruiz
f9446e8247
Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher
2019-10-29 13:45:38 -07:00
danteruiz
3f110d2035
fix windows install process
2019-10-29 13:45:28 -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
Shannon Romano
5221d5940f
Merge pull request #16422 from RebeccaStankus/mac2588
...
Added extra attempt to parent interactive window content on creation
2019-10-29 12:55:09 -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
amerhifi
12cbc6ae62
merge conflict
2019-10-29 11:49:41 -07:00
Rebecca Stankus
b8d6a2cf0b
Added extra attempt to parent interactive window content on creation
2019-10-29 11:20:14 -07:00
amerhifi
77f5b985a1
added read/write lock to hmd name
2019-10-29 11:19:59 -07:00
amerhifi
9370ce9b76
removed items
2019-10-29 10:24:30 -07:00
Amer
5c3d4649ef
Merge pull request #16420 from amerhifi/dev-2571-alt
...
temp reverting the call to display plugin
2019-10-29 10:12:35 -07:00
amerhifi
884cbd7de9
working on moving display plugin lookup to audiodevices
2019-10-29 09:26:48 -07:00
Howard Stearns
368b2bce90
Merge pull request #16375 from SimonWalton-HiFi/avatar-challenge-persist
...
DEV-2390: Persist in checking owner and sending challenges for failures
2019-10-29 08:48:59 -07:00
amerhifi
57302dd223
fixing build warning on mac/linux
2019-10-29 08:34:35 -07:00
amerhifi
37ba50992c
temp reverting the call to display plugin
2019-10-29 07:16:58 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control
2019-10-28 17:51:29 -07:00
Simon Walton
285d73a802
Fix transition from verify-failed to noncertified
2019-10-28 17:47:46 -07:00