Commit graph

33391 commits

Author SHA1 Message Date
Brad Davis
56f01cb7bd Merge remote-tracking branch 'upstream/instancing' into instancing 2019-09-25 16:27:22 -07:00
sabrina-shanman
af460d7f5f Add hfm::Shape::transformedExtents. Mark select hfm fields as
deprecated.
2019-09-25 16:11:48 -07:00
Brad Davis
911fd27fc5 wip 2019-09-25 09:30:35 -07:00
Brad Davis
af205c7f1e Merge remote-tracking branch 'upstream/instancing' into instancing 2019-09-24 12:03:42 -07:00
Brad Davis
c4a1fe9a00 Warnings 2019-09-24 11:05:33 -07:00
sabrina-shanman
725d4ee643 Fix build warnings 2019-09-24 10:57:16 -07:00
Brad Davis
85b22be68b Fixing warnings 2019-09-23 16:42:34 -07:00
Brad Davis
5edb312346 gltf wip 2019-09-23 10:22:13 -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
cf8e584ced Make the cluster jointIndex unsigned 2019-09-18 15:11:12 -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
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
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
3c043309be
Detect HMD mode properly from rig, in order to enable head IK 2019-09-12 14:03:17 -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
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
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
Simon Walton
639beee6cb Fix logic for reliable service address-change when new add already used 2019-09-11 15:21:49 -07:00
sabrina-shanman
df5684c437 Introduce hfm::Shape object 2019-09-11 14:58:23 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
dante ruiz
b969a9b1e0 fix tablet html loading errors 2019-09-10 16:50:50 -07:00
sabrina-shanman
65d85138cc TIL that std::vector<bool> is a bit field
https://howardhinnant.github.io/onvectorbool.html
2019-09-10 16:31:30 -07:00
sabrina-shanman
384b7fd629 Fix FBXBaker failing when an unbaked mesh is empty
Error early for all model bakers for draco errors
2019-09-10 15:22:54 -07:00
Zach Fox
b39e527b5b DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths) 2019-09-10 11:57:02 -07:00
sabrina-shanman
5171b660ae Give better error message when draco part of model baking fails 2019-09-09 17:32:27 -07:00
Sam Gateau
a290723583 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 13:43:52 -07:00
Sam Gateau
3c34443f24 where possible (in OpenGLDisplayPLugin) remove the need for the eye specific function and keep it in the HMD display plugin for the case of the POinter drawcall 2019-09-09 13:43:32 -07:00