Commit graph

77024 commits

Author SHA1 Message Date
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Sam Gondelman
dc4e2645da
even better! 2019-03-07 08:05:32 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
Wayne Chen
aabdb98d2f
Merge pull request #10 from wayne-chen/pushToTalk
updating compile failure + icons/settings update
2019-03-06 17:30:15 -08:00
amantley
fcf1e34175
Merge pull request #15114 from amantley/ikEnabledFix
Ik enabled fix
2019-03-06 20:29:38 -05:00
Wayne Chen
e218e4bead updating compile failure + icons/settings update 2019-03-06 17:29:32 -08:00
danteruiz
a0bd2f67ec fix stylus gizmo intersection 2019-03-06 17:20:36 -08:00
Shannon Romano
d068630728
Merge pull request #15108 from sabrina-shanman/crash_physics-fst
(case 21585) Fix crash when FST model used as both graphics and physics model
2019-03-06 17:06:38 -08:00
sabrina-shanman
1576125c42 Integrate HFM Asset Engine (aka model prep step) into Oven
Add 'deduplicateIndices' parameter to FBXSerializer and make deduplicate a required parameter for extractMesh

Add draco mesh and FBX draco node version

Support generating/saving draco meshes from FBX Model nodes
2019-03-06 15:54:12 -08:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -08:00
sabrina-shanman
82382fe9a1 Use hifi types consistently in model-baker 2019-03-06 15:35:34 -08:00
SamGondelman
168e47aa62 bake particles and polylines 2019-03-06 15:34:12 -08:00
SamGondelman
1a1277e9e7 it's working! 2019-03-06 15:34:12 -08:00
SamGondelman
94de0c12bc working on material baker 2019-03-06 15:34:11 -08:00
SamGondelman
4965adbc2f bake js and collision hull 2019-03-06 15:34:11 -08:00
SamGondelman
7fc9a3fdb6 wip 2019-03-06 15:34:10 -08:00
SamGondelman
162573bc63 enable js baking from non-local file 2019-03-06 15:34:10 -08:00
SamGondelman
270b96aa8d cleaning up oven 2019-03-06 15:34:09 -08:00
sabrina-shanman
86c948f116 Convert hfmModel and materialMapping fields in model-baker Baker to getters 2019-03-06 15:33:31 -08:00
sabrina-shanman
612cf43c43 Use HifiTypes.h in VHACDUtil.cpp 2019-03-06 15:22:36 -08:00
sabrina-shanman
2af17015d3 Convert serializers and FBX.h to use HifiTypes.h 2019-03-06 15:19:01 -08:00
sabrina-shanman
8ff212ac95 Move custom draco mesh attributes from FBX.h to HFM.h 2019-03-06 15:18:58 -08:00
sabrina-shanman
aef696efe6 Add passthrough config to PrepareJointsTask 2019-03-06 15:18:26 -08:00
sabrina-shanman
9c9dc553a2 Fix binding to temporary when trying to safely get empty model-baker task data 2019-03-06 15:18:25 -08:00
sabrina-shanman
4ae0c79130 Harden model-baker Engine against random tasks being disabled 2019-03-06 15:18:22 -08:00
sabrina-shanman
e4d6d5af89 Streamline ModelBaker initialization and URLs 2019-03-06 15:18:19 -08:00
amantley
474a97d0fc now update the ikOverlayAlpha every frame 2019-03-06 15:15:30 -08:00
SamGondelman
0f3e1b9157 fix wearable scale on position change 2019-03-06 14:53:21 -08:00
Anthony Thibault
c5e9a7d1ab Added unit test for AnimPose() ctor using matrix with negative determinant 2019-03-06 14:26:50 -08:00
Anthony Thibault
5fcfa265d2 Remove alternate versions of AnimPose(mat4) constructor 2019-03-06 14:02:58 -08:00
David Back
cea17985ff new jointRotationOffset field 2019-03-06 13:55:20 -08:00
David Back
9cc1a7aaaa CR changes 2019-03-06 13:44:27 -08:00
David Back
d063825269 export unity material data to materialMap in fst 2019-03-06 13:44:27 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Anthony Thibault
0dbc83049b Make AnimPose from mat4 work better for matrices with negative determinants.
Took part of this code from glm::decompose() which references
https://opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
2019-03-06 13:28:14 -08:00
Brad Davis
de1513a6dd Turn on KHR_no_error for the quest frame player 2019-03-06 13:22:48 -08:00
Brad Davis
b515a0cceb Support KHR_no_error in the VR wrapper API 2019-03-06 13:15:12 -08:00
Brad Davis
05ba515c73 Support KHR_no_error in the VR context 2019-03-06 13:13:45 -08:00
Howard Stearns
8ebab88613 Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master 2019-03-06 13:08:19 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
2019-03-06 13:06:45 -08:00
NissimHadar
4e7f558af8 Merge branch 'master' of github.com:highfidelity/hifi into 21507-replaceQNetworkAccessManagerWithPython 2019-03-06 13:02:36 -08:00
Shannon Romano
fc2f1ff994
Merge pull request #14955 from thoys/fix/create/reloadCrash
Case 18299: Remove workaround for Interactive window crash now that it is fixed
2019-03-06 12:46:00 -08:00
Shannon Romano
bde6ced7c8
Merge pull request #15049 from thoys/fix/fst/materialRelativePaths
Case 21474: relative paths in FST material parsing
2019-03-06 12:38:13 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
Case 21340: avatar doctor project page status
2019-03-06 12:36:18 -08:00
amantley
e72cc8b16e put the ik optimized part of the conditional inside a android build define statement 2019-03-06 12:09:53 -08:00
Sam Gateau
f203d71159
Merge pull request #15069 from NissimHadar/21482-addSSIMResultsImage
Case 21482: add SSIM results image
2019-03-06 12:01:33 -08:00
Wayne Chen
0d3c13517c
Merge pull request #9 from wayne-chen/pushToTalk
exposing pushingToTalk setter
2019-03-06 11:46:42 -08:00
Wayne Chen
96a5cc5563 Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk 2019-03-06 11:45:59 -08:00
Wayne Chen
a318b715c3 exposing setting pushingToTalk 2019-03-06 11:45:43 -08:00
Howard Stearns
ddfd437696 ensure error message when marketplace update fails 2019-03-06 11:37:17 -08:00