31758 commits

Author	SHA1	Message	Date
sabrina-shanman	cb1f42afe5	Copy pre-parsed node from FBXSerializer for baking	2019-03-13 16:44:50 -07:00
sabrina-shanman	3aaa18f529	Might as well deduplicate indices when loading model for baking	2019-03-13 16:44:50 -07:00
sabrina-shanman	32d5f7135f	Give the oven model-baker Baker an appropriate materialMappingBaseURL, but disable ParseMaterialMappingTask for now	2019-03-13 16:44:50 -07:00
sabrina-shanman	7f77e163ac	Restore 'Re-bake originals' checkbox to domain bake window	2019-03-12 18:17:11 -07:00
sabrina-shanman	a93825c2f9	Fix remaining issues with merge	2019-03-12 18:14:18 -07:00
sabrina-shanman	ddc4f5349e	Merge branch 'master' into hfm_oven_wip	2019-03-12 16:23:07 -07:00
sabrina-shanman	41c0594361	Make output folder cleaner for single model bake when baked model url is given as input	2019-03-12 15:36:13 -07:00
sabrina-shanman	b42c6d1352	Fix baked models not mapping to correct textures	2019-03-12 15:36:06 -07:00
sabrina-shanman	5b504c4759	Add encode/decode speed config to BuildDracoMeshTask	2019-03-12 15:36:05 -07:00
sabrina-shanman	efc9f993f5	Add FSTBaker, and make ModelBaker output an FST ... Restore feature to look for baked model file in other oven directory	2019-03-12 15:34:57 -07:00
Sabrina Shanman	ff67cd652e	Merge pull request #15158 from SamGondelman/unrigged ... Case 7295: Fix rendering of unrigged vertices	2019-03-12 10:59:29 -07:00
John Conklin II	2cf7462fbc	Merge pull request #15159 from dback2/jointOffset2RenamingFix ... Case 21669: Fix joint renaming with jointRotationOffset2	2019-03-12 10:32:02 -07:00
David Back	f0bf87b3c3	fix joint out not being renamed with jointRotationOffset2	2019-03-11 18:53:35 -07:00
Shannon Romano	44fa00606a	Merge pull request #15153 from danteruiz/fix-soft-entity-popping ... Case 21618: menithal's avatar is constantly flashing	2019-03-11 18:09:44 -07:00
SamGondelman	2b32b77bed	handle case when clusterMatrices.size() == 0	2019-03-11 17:32:40 -07:00
Wayne Chen	0279373d11	Merge branch 'master' into ptt	2019-03-11 17:09:37 -07:00
Wayne Chen	4add8c1777	Merge pull request #15098 from wayne-chen/muteWarningModified ... Case 21564: Warn When Muted	2019-03-11 16:53:00 -07:00
SamGondelman	b24b7fed3d	the root node isn't the first onegit add ../.git add ../.	2019-03-11 15:34:41 -07:00
Shannon Romano	c0240d2431	Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh ... Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes	2019-03-11 15:33:32 -07:00
Wayne Chen	36c2358dc0	Merge branch 'master' into muteWarningModified	2019-03-11 14:35:13 -07:00
Shannon Romano	801306364a	Merge pull request #15148 from samcake/rc81-hero ... Case 21639: RC81: Adding Hero support in simulation of avatars	2019-03-11 14:13:49 -07:00
SamGondelman	b7e1798d1b	better handling of unrigged vertices on skinned mesh	2019-03-11 11:28:30 -07:00
danteruiz	4371723145	fix soft entity popping	2019-03-11 11:27:12 -07:00
Wayne Chen	3dcc53a945	Merge branch 'master' into ptt	2019-03-10 17:14:54 -07:00
Bradley Austin Davis	0e46007d84	Merge pull request #15116 from jherico/fix/oculus_sdk_update ... Case 21595: Oculus SDK Update	2019-03-08 23:53:06 -08:00
Sam Gateau	3464fe09c1	Applying the hero changes to master soon to be rc81	2019-03-08 18:13:20 -08:00
Anthony Thibault	c36d752b6b	Merge pull request #15141 from luiscuenca/flowAPIExtra ... add getFlowData method to MyAvatar	2019-03-08 17:45:11 -08:00
Shannon Romano	ca87e217bd	Merge pull request #15097 from wayne-chen/audioSettingsModified ... Case 21562: Audio settings screen	2019-03-08 16:22:52 -08:00
Wayne Chen	18b86d550d	adding PushToTalk action	2019-03-08 16:07:48 -08:00
luiscuenca	80150565f6	Fix bug on group settings	2019-03-08 16:30:28 -07:00
Shannon Romano	a8f6e74ca4	Merge pull request #15135 from SamGondelman/text81 ... Case 21628: Fix text rendering on AMD/Mac	2019-03-08 14:59:37 -08:00
Thijs Wenker	ded58b96f0	Merge pull request #15139 from huffman/feat/tga-textures ... Case 21220: Add more complete support for .tga files	2019-03-08 23:53:21 +01:00
Thijs Wenker	60d46998ec	Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings ... Case 21449: [AvatarPackager/AvatarDoctor] Warnings update	2019-03-08 23:51:58 +01:00
Anthony Thibault	aa3b27d89e	Merge pull request #15143 from amantley/bugShadowNames2 ... loading jointRotationOffset2 from FST and deal with the shadow joints	2019-03-08 14:37:30 -08:00
Ryan Huffman	62f17acaf7	Fix warnings in TGAReader	2019-03-08 14:01:29 -08:00
luiscuenca	4858f64810	get the colliding joints	2019-03-08 14:36:47 -07:00
Ryan Huffman	1f0a8b18c8	Fix warning about TGAOrientation	2019-03-08 13:01:56 -08:00
luiscuenca	f363d95ca2	clear group settings on init	2019-03-08 13:02:47 -07:00
Ryan Huffman	2af9dc886a	Add logging category to TGAReader	2019-03-08 11:56:04 -08:00
amantley	6b18b22433	loading jointRotationOffset2 from FST and deal with the shadow joints	2019-03-08 11:53:12 -08:00
luiscuenca	cb6f573b35	Merge branch 'master' into flowAPIExtra	2019-03-08 12:43:02 -07:00
Roxanne Skelly	c33d2aafda	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
Roxanne Skelly	e94d248ac5	Merge pull request #15126 from howard-stearns/domainUnlimited ... unlimited certified copies in a domain	2019-03-08 10:23:42 -08:00
Ryan Huffman	c55811ced5	Add support for TGA orientation	2019-03-08 09:47:35 -08:00
Ryan Huffman	5fd2b0699a	Add more complete support for .tga files	2019-03-08 09:47:35 -08:00
luiscuenca	e8da6b5a0c	add getFlowData	2019-03-08 10:36:58 -07:00
Thijs Wenker	d985d1bff0	use Rig instead of Avatar for height calculations	2019-03-08 03:36:56 +01:00
Anthony Thibault	dcd1258439	Merge pull request #15119 from hyperlogic/feature/improve-anim-pose-negative-scale ... Improve AnimPose support for negative scale	2019-03-07 17:05:46 -08:00
Sam Gondelman	1ed2012a63	Merge pull request #15132 from SamGondelman/text ... Case 21621: Fix crash on startup	2019-03-07 16:54:29 -08:00
SamGondelman	af03fb5f85	try to fix text rendering on amd with transparency	2019-03-07 16:23:12 -08:00