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
milad
a7427bcb18
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-11-05 17:32:54 -08:00
milad
56838de22d
fixed conflicts
2019-11-05 17:32:46 -08:00
milad
c6f7c058bc
merging master
2019-11-05 17:30:09 -08:00
milad
e08ddf521c
updated electron app ui
2019-11-05 17:28:21 -08:00
David Rowe
eeceec35d6
Fix entities list "filter to frustum" button
2019-11-06 12:22:45 +13:00
amerhifi
382b9fabaf
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-11-05 15:15:16 -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
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
Zach Fox
4e801632ee
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-04 13:16:43 -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
Sam Gateau
e19a46f14b
Merge pull request #16444 from sabrina-shanman/instancing_slimmesh
...
Instancing: Calculate shape extents using existing extents in simple mesh
2019-11-01 16:50:21 -07:00
