Merge pull request #312 from umasteeringgroup/fix/Inevitable210Fixes

Fix/inevitable210 fixes
umasteeringgroup · Jun 22, 2020 · eb624c3 · eb624c3
2 parents 728f2af + 050a476
commit eb624c3
Show file tree

Hide file tree

Showing 106 changed files with 74,290 additions and 1,488 deletions.
diff --git a/UMAProject/Assets/UMA/Content/Example/Animators/Materials.meta b/UMAProject/Assets/UMA/Content/Example/Animators/Materials.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Content.asmdef2019 b/UMAProject/Assets/UMA/Content/UMA_Content.asmdef2019
diff --git a/...ssets/UMA/Content/UMA_Content.asmdef20184 → ...Assets/UMA/Content/UMA_Content.asmdefTemp b/...ssets/UMA/Content/UMA_Content.asmdef20184 → ...Assets/UMA/Content/UMA_Content.asmdefTemp
diff --git a/.../UMA/Content/UMA_Content.asmdef20184.meta → ...s/UMA/Content/UMA_Content.asmdefTemp.meta b/.../UMA/Content/UMA_Content.asmdef20184.meta → ...s/UMA/Content/UMA_Content.asmdefTemp.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Core.meta b/UMAProject/Assets/UMA/Content/UMA_Core.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Core/HumanFemale.meta b/UMAProject/Assets/UMA/Content/UMA_Core/HumanFemale.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Core/HumanFemale/FBX.meta b/UMAProject/Assets/UMA/Content/UMA_Core/HumanFemale/FBX.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Core/HumanFemale/FBX/TPoses.meta b/UMAProject/Assets/UMA/Content/UMA_Core/HumanFemale/FBX/TPoses.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Core/HumanMale.meta b/UMAProject/Assets/UMA/Content/UMA_Core/HumanMale.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Core/HumanMale/FBX.meta b/UMAProject/Assets/UMA/Content/UMA_Core/HumanMale/FBX.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Core/HumanMale/FBX/TPoses.meta b/UMAProject/Assets/UMA/Content/UMA_Core/HumanMale/FBX/TPoses.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Secrets.meta b/UMAProject/Assets/UMA/Content/UMA_Secrets.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Secrets/How to install secret stuff.docx b/UMAProject/Assets/UMA/Content/UMA_Secrets/How to install secret stuff.docx
diff --git a/UMAProject/Assets/UMA/Content/UMA_Secrets/How to install secret stuff.docx.meta b/UMAProject/Assets/UMA/Content/UMA_Secrets/How to install secret stuff.docx.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Secrets/SecretHair.meta b/UMAProject/Assets/UMA/Content/UMA_Secrets/SecretHair.meta
diff --git a/UMAProject/Assets/UMA/Content/UMA_Secrets/SecretHair/MaleHairSlick01.meta b/UMAProject/Assets/UMA/Content/UMA_Secrets/SecretHair/MaleHairSlick01.meta