Commit graph

81799 commits

Author SHA1 Message Date
sabrina-shanman
9a65d78cdf Fix model baking to work with new hfm::Shape material definition (1
material per mesh part)
2019-11-11 17:52:00 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
Merge master into instancing
2019-11-08 10:10:50 -08:00
Sabrina Shanman
59861ea5b9
Merge pull request #16474 from sabrina-shanman/instancing_collision
Fix unused variables/implicit type conversions
2019-11-08 10:05:43 -08:00
sabrina-shanman
a42e09aef8 Fix unused variables/implicit type conversions 2019-11-08 10:04:34 -08:00
Sabrina Shanman
04f38a01f1
Merge pull request #16460 from sabrina-shanman/instancing_collision
(DEV-564) computeShapeInfo fixes, Extent calculation optimization
2019-11-07 17:23:16 -08:00
Maia Hansen
7855747386
Merge pull request #16470 from samcake/zorro
Procedural Material crashes in shadow pass  on deformed shape renderItems
2019-11-07 15:00:06 -08:00
Sabrina Shanman
9180a639df
Merge pull request #16440 from ctrlaltdavid/DEV-2648
DEV-2648: Fix Cmd-click multi-select in entity list on Mac
2019-11-07 14:06:39 -08:00
Sam Gateau
86b62f921d Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it 2019-11-07 14:01:50 -08:00
Sabrina Shanman
deceb16a9b
Merge pull request #16451 from ctrlaltdavid/DEV-2650
DEV-2650: Remove "user" icon from Entities List
2019-11-07 13:59:28 -08:00
Shannon Romano
176b463f16
Merge pull request #16458 from hyperlogic/bug-fix/anim-blend-directional-assert
Fix for assert in AnimBlendDirectional on startup
2019-11-07 13:11:11 -08:00
Shannon Romano
4484ef095c
Merge pull request #16464 from DouglasWilcox/seated_fidgets_less_fidgety
Reduce fidgety motions in seated fidgets
2019-11-07 09:09:05 -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
dooglifeSF
15b935b491 remove jitter and bounce from several seated idles and fidgets, also reduce look-around cone 2019-11-06 13:08:42 -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
sabrina-shanman
33bb0e2b19 Change RenderableModelEntityItem::computeShapeInfo to support new HFM format 2019-11-05 14:44:23 -08:00
Anthony J. Thibault
6e7f222608 Fix for assert in AnimBlendDirectional on startup
Specifically, std::vector subscript out of range.
2019-11-05 14:16: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
sabrina-shanman
88b6472ced Fix build warning 2019-11-05 10:57:55 -08:00
sabrina-shanman
da5f80c139 Use std::vector types in ShapeInfo 2019-11-05 10:57:55 -08:00
sabrina-shanman
921eed1ec1 Remove CollisionPick::computeShapeInfo 2019-11-05 10:57:54 -08:00
Sam Gateau
7af0940846 getting coision to work 2019-11-05 10:57:54 -08:00
sabrina-shanman
27643023a3 Make shape extent calculations use slim mesh extents, and rename task to CalculateTransformedExtentsTask 2019-11-05 10:57:54 -08:00
sabrina-shanman
c3af8b5da7 Remove unused cluster fields from hfm 2019-11-05 10:57:54 -08:00
sabrina-shanman
ba257634f2 Introduce extents for TriangleListMesh and calculate them 2019-11-05 10:57:54 -08:00
Sabrina Shanman
1837ab6111
Merge pull request #16455 from sabrina-shanman/instancing
Instancing: Fix build error with _drawTransform
2019-11-05 10:57:28 -08:00
sabrina-shanman
67e05a70d4 Fix build error with _drawTransform 2019-11-05 10:56:29 -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
Sabrina Shanman
28b68b6fce
Merge pull request #16453 from sabrina-shanman/instancing
Merge master into instancing
2019-11-05 10:25:51 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -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
David Rowe
a8173e9477 Remove "user" icon from Entity List 2019-11-05 13:55:31 +13: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