Commit graph

80737 commits

Author SHA1 Message Date
sabrina-shanman
2077da6f37 Create ReweightDeformersTask 2019-09-26 17:06:41 -07:00
Sabrina Shanman
6234c83a24
Merge pull request #16253 from sabrina-shanman/instancing_deprecated
Add hfm::Shape::transformedExtents. Deprecate hfm fields.
2019-09-25 16:14:47 -07:00
sabrina-shanman
af460d7f5f Add hfm::Shape::transformedExtents. Mark select hfm fields as
deprecated.
2019-09-25 16:11:48 -07:00
Sabrina Shanman
09b04e8a89
Merge pull request #16216 from sabrina-shanman/instancing_buildgraphicsmeshtask
(DEV-591) Change BuildGraphicsMeshTask to use new deformers
2019-09-24 12:01:17 -07:00
sabrina-shanman
725d4ee643 Fix build warnings 2019-09-24 10:57:16 -07:00
sabrina-shanman
99386565b0 Fix build warnings/errors 2019-09-19 11:15:38 -07:00
sabrina-shanman
56896e0866 Re-name error message to mention deformers, not blendshapes 2019-09-19 09:26:28 -07:00
sabrina-shanman
de8223fee8 Change BuildGraphicsMeshTask to use new deformers 2019-09-18 15:46:15 -07:00
Sabrina Shanman
cd316f3908
Merge pull request #16215 from sabrina-shanman/instancing_shape
Make the cluster jointIndex unsigned
2019-09-18 15:25:56 -07:00
sabrina-shanman
cf8e584ced Make the cluster jointIndex unsigned 2019-09-18 15:11:12 -07:00
Sabrina Shanman
468d9f093d
Merge pull request #16203 from sabrina-shanman/instancing_shape
Make hfm::Deformer more closely resemble original model data
2019-09-16 16:38:29 -07:00
sabrina-shanman
ac06234c3d Make hfm::Deformer more closely resemble original model data. Leave weight-based blendshape packing to preparations step. 2019-09-16 16:07:01 -07:00
Sabrina Shanman
bbe9e6fc61
Merge pull request #16199 from sabrina-shanman/instancing_shape
Make fields for TransformNode, Deformer, DynamicTransform public
2019-09-16 11:11:19 -07:00
sabrina-shanman
517bef63a9 Make fields for TransformNode, Deformer, DynamicTransform public 2019-09-16 11:09:48 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
Sabrina Shanman
092a7e96f9
Merge pull request #16194 from sabrina-shanman/instancing_shape
(DEV-557) Introduce hfm::Shape
2019-09-16 09:56:39 -07:00
sabrina-shanman
46616b4efd Fix more integer conversion warnings 2019-09-16 09:55:25 -07:00
sabrina-shanman
5837053f50 Fix miscellaneous build errors/warnings 2019-09-13 16:56:30 -07:00
sabrina-shanman
a166b41216 Fix build warnings/errors 2019-09-13 15:39:29 -07:00
sabrina-shanman
b14593202c Give hfm::Shape keys special undefined value 2019-09-13 14:26:18 -07:00
sabrina-shanman
c765e1af39 Add dynamicTransforms to hfm::Model 2019-09-13 14:26:18 -07:00
Maia Hansen
9811f54c94
Merge pull request #16189 from AndrewMeadows/ess-with-simulation-fallout-001
BUGZ-1459: don't rely on final simulation update for kinematic entities
2019-09-13 13:16:05 -07:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html
BUGZ-1398: HMD Tablet Apps blocked by Web access error
2019-09-13 12:35:29 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
sabrina-shanman
d948e434dd DyanamicTransform concept 2019-09-13 09:54:46 -07:00
Shannon Romano
bb7813631d
Merge pull request #16183 from luiscuenca/allowLeaningWhileSeated
BUGZ-1435: Re-enable head IK when seated on HMD
2019-09-13 09:03:17 -07:00
MiladNazeri
b8e3873e96
Merge pull request #16182 from MiladNazeri/BUGZ-1452/entity-link-property-right-button-disable
Bugz 1452/entity link property right button disable
2019-09-13 08:08:29 -07:00
Andrew Meadows
bc119d6c85 don't expect final kinematic simulation update 2019-09-12 17:02:19 -07:00
Shannon Romano
36bc538354
Merge pull request #16181 from SimonWalton-HiFi/connection-addr-change-logic
BUGZ-1432: Fix logic for address-change to address already being used
builds failing, now android is failing for nothing related to this PR
2019-09-12 15:54:55 -07:00
luiscuenca
4aa85baf75
Restate disable leaning when seated 2019-09-12 14:07:56 -07:00
luiscuenca
3c043309be
Detect HMD mode properly from rig, in order to enable head IK 2019-09-12 14:03:17 -07:00
Shannon Romano
6a78ea1471
Merge pull request #16139 from jennaingersoll/api-docs
API docs formatting updates
2019-09-12 13:09:28 -07:00
Maia Hansen
53aed1e6bf
Merge pull request #16171 from sabrina-shanman/bug_oven_draco
(BUGZ-1446) Fix oven error when baking FBX mesh with no indices
2019-09-12 12:37:49 -07:00
Simon Walton
2d68cfa5e7 Use unique_lock::unlock() instead of unique_lock::release()
... which actually has the opposite effect
2019-09-12 12:04:24 -07:00
sabrina-shanman
00f7b75f34 Fix draco errors being added to wrong part of list 2019-09-12 10:45:35 -07:00
luiscuenca
f7f0483320
Don't disable HMD leaning while seated 2019-09-12 08:41:35 -07:00
Shannon Romano
fa8c959699
Merge pull request #16133 from ctrlaltdavid/DOC-59
DOC-59: Assets JSDoc
2019-09-11 17:19:45 -07:00
jennaingersoll
c439358626
Merge pull request #16180 from ctrlaltdavid/DOC-163
DOC-163: Fix up Workload JSDoc stubs
2019-09-11 17:16:09 -07:00
milad
e56d0066a3 Merge branch 'master' of github.com:highfidelity/hifi into BUGZ-1452/entity-link-property-right-button-disable 2019-09-11 17:08:39 -07:00
milad
12b980d99d about to test if this new right click disable is working 2019-09-11 17:08:35 -07:00
jennaingersoll
d548afb277
Removed indent per review 2019-09-11 17:06:35 -07:00
sabrina-shanman
ccdfb11de2 Re-order hfm::Model variables and add shapeTransforms list 2019-09-11 16:57:57 -07:00
sabrina-shanman
b944db3e79 std::vector-ize joints and materials in hfm::Model 2019-09-11 16:54:07 -07:00
sabrina-shanman
c4db6c78d8 std::vector-ize meshes/mesh parts in hfm::Model 2019-09-11 16:50:50 -07:00
David Rowe
fad1296180 Fix up Workload JSDoc stubs 2019-09-12 11:02:10 +12:00
MiladNazeri
fb9a6a3c78
Merge pull request #16175 from MiladNazeri/dev-551/hide-crash-menu-behind-enviornment-variables
DEV-551/hide-crash-menu-behind-environment-variable
2019-09-11 15:47:40 -07:00
Zach Fox
3cfb4db36e
Merge pull request #16177 from MiladNazeri/DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
2019-09-11 15:35:04 -07:00
Simon Walton
639beee6cb Fix logic for reliable service address-change when new add already used 2019-09-11 15:21:49 -07:00
Zach Fox
3edea5bf13
Merge pull request #16178 from zfox23/noEmoteIndicatorAnimation
BUGZ-1339: Disable the Emote Indicator animation to prevent it from being 'jittery'
2019-09-11 15:10:18 -07:00
Zach Fox
a5504c3780
Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
2019-09-11 15:05:44 -07:00