Commit graph

81504 commits

Author SHA1 Message Date
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
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
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
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
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
Rebecca Stankus
b8d6a2cf0b Added extra attempt to parent interactive window content on creation 2019-10-29 11:20:14 -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
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
Shannon Romano
2bc8c66b96
Merge pull request #16418 from danteruiz/new-qt-prefix
DEV-1828: hifi_vcpkg.py crashes try downloading not defined qt url on an unknown linux system or unknown operating system
2019-10-28 16:01:32 -07:00
danteruiz
c64b716a07 fix hifi_vcpkg.py script crash 2019-10-28 14:21:19 -07:00
dante ruiz
da0ba71373 remove un-needed file 2019-10-28 14:18:17 -07:00
dante ruiz
0797e154a1 first round of review changes 2019-10-28 13:41:15 -07:00
Zach Fox
0afcb67c41
Merge pull request #16415 from zfox23/caseInsensitiveEmoteShortcuts
DEV-2574: Make emote shortcuts case-insensitive
2019-10-28 11:50:09 -07:00
Amer
e61d9f3091
Merge pull request #16409 from amerhifi/dev-2450
case dev 2286: Wireless headphones crash due to missing device
2019-10-28 11:39:04 -07:00
Zach Fox
bda1e3f696
Merge pull request #16398 from RebeccaStankus/grayEmoteWindow
Gray emote window
2019-10-28 11:37:17 -07:00
Zach Fox
c578eb2d9b DEV-2574: Make emote shortcuts case-insensitive 2019-10-28 11:24:42 -07:00
Shannon Romano
316bdc83ae
Merge pull request #16414 from MiladNazeri/serverConsoleFix
Server console fix
2019-10-28 10:46:27 -07:00
amer cerkic
f1f67f1996 android build fix 2019-10-28 10:42:25 -07:00
Zach Fox
c4e83e553f
Merge pull request #16408 from zfox23/autoLowerHandIfTalking
DEV-2575: Automatically lower raised hand if talking
2019-10-28 10:00:08 -07:00
danteruiz
761ca1c2f5 Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher 2019-10-28 09:41:05 -07:00
danteruiz
afbb16ea78 undo some changes 2019-10-28 09:40:48 -07:00
milad
2059168bd3 switched to arrow functions 2019-10-28 09:05:38 -07:00
milad
c672213a88 quieted warning 2019-10-28 09:03:52 -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
35082a730e Changed the desktop sprint speed to 2.0.
This change will not actually be felt by users, because the speed was already effectively 2.0
(because the sprint speeds for Desktop and HMD were reversed).
2019-10-27 09:35:16 +02:00