Commit graph

81695 commits

Author SHA1 Message Date
Kasen IO
210c509c2b Updated readme.md 2019-12-03 10:48:09 -05:00
Kasen IO
268112ffaf HiFi readme moved aside, new readme inserted 2019-12-03 10:30:06 -05:00
Kasen IO
edfce861a8 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:56:19 -05:00
Kasen IO
07d706d681 Removed all hardcoded whitelist rules 2019-12-01 22:55:51 -05:00
Kasen IO
94df2c304b Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:08:45 -05:00
Kasen IO
b24cc3658c Update CMakeLists.txt
re-added oculus plugins to cmakelists.txt
2019-12-01 22:08:26 -05:00
Kasen IO
165eb16f93 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 20:04:32 -05:00
Kasen IO
872a0b4496 Updated application version to 86. 2019-12-01 20:04:00 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
Shannon Romano
f38509dad5
Merge pull request #16489 from hyperlogic/bug-fix/hmd-strafe-transition-bug-rc86
RC86: Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states
Force merge due to build issues.
2019-11-13 12:48:11 -08:00
DouglasWilcox
a3de25618a Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
(cherry picked from commit f9f28fc286)
2019-11-13 09:52:56 -08:00
Kalila R
7c1b9e79ae Setting ModelBaker.cpp back to main. 2019-11-11 20:28:16 -05:00
Kalila R
5f7486fe7e Setting DomainBaker.cpp back to main. 2019-11-11 20:26:26 -05:00
Kalila R
a7b2c3a32c Updated application name and version. 2019-11-11 20:22:19 -05:00
Kalila R
fd7ac223b0 activitylogger still disabled but does not output to console 2019-11-11 20:08:03 -05:00
Shannon Romano
b14c1ee331
Merge pull request #16471 from samcake/v0860
DEV-2711: Fix with procedural material and shadows applied on deformed mesh
2019-11-08 10:25:10 -08:00
Sam Gateau
269289412e Same fix for highlight effects 2019-11-08 09:11:58 -08:00
Sam Gateau
5682e8ee2f Fixing bug with custom pipeline and deformed shape renderItems in shadow pass 2019-11-07 15:16:11 -08:00
Shannon Romano
10a1ee24e8
Merge pull request #16462 from zfox23/removeHomeIcon
DEV-2701: Remove the home icon from the profile app
2019-11-06 15:34:18 -08:00
Zach Fox
d29fdbd9f2
Merge pull request #16463 from zfox23/newHazeMinMax
DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI
2019-11-06 13:33:35 -08:00
Shannon Romano
06a4267963
Merge pull request #16456 from hyperlogic/bug-fix/avatar-recording-bug
Fix for avatar recordings not playing back blendshapes
2019-11-06 13:33:22 -08:00
Anthony Thibault
8f0ca7b6db
Merge pull request #16447 from luiscuenca/hideNeckSecondPass
DEV-2461: Head woes in 1st person part 2
2019-11-06 12:11:59 -08:00
Clément Brisset
96f53dbbf3
Merge pull request #16448 from matt-hifi/deep-codesign
"deep" codesign Interface on macOS
2019-11-06 12:08:29 -08:00
Zach Fox
a2f784d225 DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI 2019-11-06 11:26:10 -08:00
Zach Fox
ca8a61f085 DEV-2701: Remove the home icon from the profile app 2019-11-06 11:11:57 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193
DOC-193 Clarified legacy vs current camera modes
2019-11-06 10:59:32 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
Matt Hardcastle
8dc91d640b Remove this and connection from lambda expression
Clang in Xcode 11 is more aggressive about its warnings. This resolves
one of the issue Clang noticed in order to support building w/Xcode 11.

I first attempted to remove `this` completes, but VS complained that
`QObject::disconnect` was being called without `this`. This change
satisfies both Clang and VS.

A second attempt added this back and then called `disconnect` directly.
This also generated a Clang warning.

This version resolves the issue by removing the error handler. This also
resolves a memory leak caused by the error handler.
2019-11-06 09:13:40 -08:00
Amer
40f49bf41e
Merge pull request #16449 from amerhifi/master
case dev-2662: removing double calls to switch devices, handling default changes fro…
2019-11-05 19:13:10 -08:00
ingerjm0
499a0a8067 Clean up code per review 2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a Revisions per review 2019-11-05 14:04:01 -08:00
amerhifi
bc41087ea9 removing lock from WASAPI initialization 2019-11-05 12:50:59 -08:00
ingerjm0
27d4bfdd01 DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code 2019-11-05 12:20:51 -08:00
Shannon Romano
ab2f77ea8d
Merge pull request #16442 from danteruiz/fix-startmenu-icons
dev-2641: Uninstall does not show in the Windows Start Menu until the second launch of the app
2019-11-05 11:38:06 -08:00
Anthony J. Thibault
da7b835144 Fix for avatar recordings not playing back blendshapes 2019-11-05 11:10:52 -08:00
Zach Fox
23a8029550
Merge pull request #16454 from zfox23/fixUninstallHQ
Fix DEV-2598: Upgrading from Old Launcher to QT Launcher now places Start Menu shortcuts in the right place
2019-11-05 10:49:42 -08:00
Zach Fox
d0b2e644e7 Fix DEV-2598: Upgrading from Old Launcher to QT Launcher now places Start Menu shortcuts in the right place 2019-11-05 10:40:33 -08:00
amerhifi
343807a9f5 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-05 10:17:04 -08:00
Zach Fox
99f007349e
Merge pull request #16452 from zfox23/topBarExperiment
An experiment with the top bar. Will you notice?
2019-11-05 09:34:03 -08:00
Zach Fox
683c3f1300 An experiment with the top bar. Will you notice? 2019-11-05 09:33:11 -08:00
Bradley Austin Davis
69e586cc54 Fix codesign 2019-11-04 16:42:03 -08:00
amer cerkic
b10f2a86c2 removed extra spaces 2019-11-04 15:44:15 -08:00
danteruiz
c8dade2060 making requested changes 2019-11-04 15:20:37 -08:00
amer cerkic
81881acafc fixing a few spacing issues 2019-11-04 15:08:06 -08:00
amer cerkic
b2ab33116f removing double calls to switch devices, handling default changes from scripting interface instead 2019-11-04 15:03:53 -08:00
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