Commit graph

81700 commits

Author SHA1 Message Date
Brad Hefta-Gaub
f5873e6f76
Merge pull request #16446 from samcake/zorro
Renaming the env variable to enable Material Procedural Shaders
2019-11-04 14:32:54 -08:00
luiscuenca
de2d2de938
Head woes in 1st person part 2 2019-11-04 13:33:00 -07:00
Zach Fox
c39dbc600d
Merge pull request #16441 from zfox23/enableHashMapSignalsForESS
Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`
2019-11-04 11:59:15 -08:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
Anthony J. Thibault
821a46697a Update fixUpLegacyBlendshapes as well 2019-11-04 10:55:05 -08:00
Anthony J. Thibault
101ec9d753 Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc).  This change should have been part of #16400 but
was accidently left out.
2019-11-04 09:49:24 -08:00
Shannon Romano
0bfbe413eb
Merge pull request #16399 from HifiExperiments/proceduralMesh
Case 7120, Case 14963: Procedural material entities on primitives and meshes
2019-11-04 08:32:31 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d fix build error, add environment variable 2019-11-02 01:03:34 -07:00
danteruiz
35ed5031a3 prevent uninstall icon from disapearing 2019-11-01 15:15:58 -07:00
Zach Fox
8d07d401c3 Add a line of JSDoc 2019-11-01 14:45:07 -07:00
Zach Fox
3a606d1907 Implement DEV-2654: Allow ESS to make use of signals like 2019-11-01 14:41:11 -07:00
RebeccaStankus
b50fb47a95
Merge pull request #16438 from RebeccaStankus/macWindowSize
Changed default interface window size on mac
2019-11-01 13:40:18 -07:00
Zach Fox
44e196c588
Merge pull request #16439 from samcake/zorro
Ending a joke
2019-11-01 13:01:55 -07:00
Sam Gateau
52e80f15af Ending a joke 2019-11-01 12:57:45 -07:00
Sam Gateau
52ac59fad3 Ending a joke 2019-11-01 12:55:34 -07:00
Sam Gateau
a3d8cb8a78 Ending a joke 2019-11-01 12:52:22 -07:00
Rebecca Stankus
3f19bbfcac Changed variable to not be magic number 2019-11-01 11:46:01 -07:00
Rebecca Stankus
e5fcc577f0 Changed default interface window size on mac 2019-11-01 10:47:12 -07:00
Shannon Romano
c5fe88abe6
Merge pull request #16435 from hyperlogic/feature/seated-aim-offsets
Hooked up seated version of aim offset animation
2019-11-01 10:31:59 -07:00
Shannon Romano
295c37aea9
Merge pull request #16434 from kencooke/audio-webrtc-warning-spam
DEV-2619: WebRTC spamming logs
2019-11-01 10:22:35 -07:00
Ken Cooke
3cdf25f2bc Fix compiler warning (unused variable in Release build) 2019-11-01 07:36:35 -07:00
Anthony J. Thibault
4b34311a0a Hooked up seated version of aim offset animation 2019-10-31 16:23:29 -07:00
Ken Cooke
30564a67ef Only log a single "AEC not supported" warning per audio device configuration 2019-10-31 14:50:52 -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
a03534427e
Merge pull request #16430 from zfox23/moreMenuScriptingInterfaceGuards
Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards
2019-10-31 12:25:41 -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
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
amerhifi
52e0f54d0c addressing comments 2019-10-31 07:21:16 -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