Merge pull request #451 from umasteeringgroup/develop

Merge 2.13 from Develop

.gitignore

@@ -1,8 +1,13 @@
+AssetStoreTools/
 Library/
 Temp/
 UnityVS/
+FluidFlow/
+ShaderlabVS/
 BetterShaders/
 BetterShaders.meta
+FlipbookGames/
+FlipbookGames.meta
 UnityVS.meta
 *.csproj
 *.sln
@@ -30,7 +35,7 @@ UMAProject/Assets/UMA/Examples/Main Examples/Scenes/UMA Core Demo - Crowd
 UMA DCS Demo - Simple Setup
 UMAProject/ProjectSettings/GraphicsSettings.asset
 UMAProject/ProjectSettings/GraphicsSettings.asset
-
+UMAProject/Packages
 UMAProject/Assets/Obi/
 UMAProject/Assets/Gizmos/
 UMAProject/Assets/Editor default resources/Obi/
@@ -42,3 +47,9 @@ UMAProject/Assets/AssetStoreTools
 UMAProject/Assets/AssetStoreTools.meta
 UMAProject/.vs
 UMAProject/Assets/Temp.meta
+UMAProject/.vsconfig
+UMAProject/Logs
+UMAProject/Assets/Assets
+UMAProject/Assets/Plugins
+UMAProject/Assets/Tarfmagougou.meta
+/UMAProject/Assets/Tarfmagougou

UMAProject/Assets/UMA/Content/Contrib/F_Shoes/FemaleTallShoes_Black.asset

@@ -3,35 +3,44 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f0188188c253e0c4bb9b46e19fa7312e, type: 3}
   m_Name: FemaleTallShoes_Black
   m_EditorClassIdentifier: 
+  label: 
+  resourcesOnly: 0
   recipeType: Wardrobe
   DisplayValue: High Tops - Black
   compatibleRaces:
   - HumanFemale
-  - HumanFemaleDCS
   - HumanFemaleHighPoly
   wardrobeRecipeThumbs:
   - race: HumanFemale
     filename: 
     thumb: {fileID: 0}
-  - race: HumanFemaleDCS
-    filename: 
-    thumb: {fileID: 0}
   - race: HumanFemaleHighPoly
     filename: 
     thumb: {fileID: 0}
   wardrobeSlot: Feet
+  Appended: 0
   Hides:
   - FemaleFeet
   - FR_High_FemaleFeet
+  HideTags: []
   suppressWardrobeSlots: []
   activeWardrobeSet: []
-  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Black","colorIdx":0,"rect":[0,0,0,0],"data":[]}]}],"colors":[],"fColors":[{"name":"-","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0]}],"sharedColorCount":0,"race":"","packedDna":[]}'
+  MeshHideAssets: []
+  OverrideDNA:
+    PreloadValues: []
+  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Black","colorIdx":0,"rect":[5.0,5.0,5.0,5.0],"isTransformed":true,"scale":{"x":5.0,"y":5.0,"z":5.0},"rotation":5.0,"blendModes":[0],"Tags":[],"tiling":[false,false,false],"uvOverride":0},{"id":"Body
+    Hair","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":1.0},"rotation":0.0,"blendModes":[0,0,0],"Tags":[],"tiling":[false,false,false],"uvOverride":0}],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0}],"colors":[],"fColors":[{"name":"-","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":0,"race":"HumanFemale","packedDna":[],"uvOverride":0}'
+  forceKeep: 0
+  labelLocalFiles: 0
+  IncompatibleRecipes: []
+  UserField: 
   replaces: Nothing

UMAProject/Assets/UMA/Content/Contrib/F_Shoes/FemaleTallShoes_Turquoise.asset

@@ -3,35 +3,43 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f0188188c253e0c4bb9b46e19fa7312e, type: 3}
   m_Name: FemaleTallShoes_Turquoise
   m_EditorClassIdentifier: 
+  label: 
+  resourcesOnly: 0
   recipeType: Wardrobe
   DisplayValue: High Tops - Turquoise
   compatibleRaces:
   - HumanFemale
-  - HumanFemaleDCS
   - HumanFemaleHighPoly
   wardrobeRecipeThumbs:
   - race: HumanFemale
     filename: 
     thumb: {fileID: 0}
-  - race: HumanFemaleDCS
-    filename: 
-    thumb: {fileID: 0}
   - race: HumanFemaleHighPoly
     filename: 
     thumb: {fileID: 0}
   wardrobeSlot: Feet
+  Appended: 0
   Hides:
   - FemaleFeet
   - FR_High_FemaleFeet
+  HideTags: []
   suppressWardrobeSlots: []
   activeWardrobeSet: []
-  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Turquoise","colorIdx":0,"rect":[0,0,0,0],"data":[]}]}],"colors":[],"fColors":[{"name":"","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0]}],"sharedColorCount":0,"race":"","packedDna":[]}'
+  MeshHideAssets: []
+  OverrideDNA:
+    PreloadValues: []
+  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Turquoise","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0],"Tags":[],"tiling":[false,false,false],"uvOverride":0}],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0}],"colors":[],"fColors":[{"name":"-","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"isBaseColor":false}],"sharedColorCount":0,"race":"HumanFemale","packedDna":[],"uvOverride":0}'
+  forceKeep: 0
+  labelLocalFiles: 0
+  IncompatibleRecipes: []
+  UserField: 
   replaces: Nothing

UMAProject/Assets/UMA/Content/Contrib/F_Shoes/FemaleTallShoes_White.asset

@@ -3,35 +3,43 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f0188188c253e0c4bb9b46e19fa7312e, type: 3}
   m_Name: FemaleTallShoes_White
   m_EditorClassIdentifier: 
+  label: 
+  resourcesOnly: 0
   recipeType: Wardrobe
   DisplayValue: High Tops - White
   compatibleRaces:
   - HumanFemale
-  - HumanFemaleDCS
   - HumanFemaleHighPoly
   wardrobeRecipeThumbs:
   - race: HumanFemale
     filename: 
     thumb: {fileID: 0}
-  - race: HumanFemaleDCS
-    filename: 
-    thumb: {fileID: 0}
   - race: HumanFemaleHighPoly
     filename: 
     thumb: {fileID: 0}
   wardrobeSlot: Feet
+  Appended: 0
   Hides:
   - FemaleFeet
   - FR_High_FemaleFeet
+  HideTags: []
   suppressWardrobeSlots: []
   activeWardrobeSet: []
-  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_White","colorIdx":0,"rect":[0,0,0,0],"data":[]}]}],"colors":[],"fColors":[{"name":"-","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0]}],"sharedColorCount":0,"race":"","packedDna":[]}'
+  MeshHideAssets: []
+  OverrideDNA:
+    PreloadValues: []
+  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_White","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0],"Tags":[],"tiling":[false,false,false],"uvOverride":0}],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0}],"colors":[],"fColors":[{"name":"-","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":0,"race":"HumanFemale","packedDna":[],"uvOverride":0}'
+  forceKeep: 0
+  labelLocalFiles: 0
+  IncompatibleRecipes: []
+  UserField: 
   replaces: Nothing

UMAProject/Assets/UMA/Content/Contrib/FemaleLongHair/FemaleLongHair_Recipe.asset

@@ -3,29 +3,37 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f0188188c253e0c4bb9b46e19fa7312e, type: 3}
   m_Name: FemaleLongHair_Recipe
   m_EditorClassIdentifier: 
+  label: 
+  resourcesOnly: 0
   recipeType: Wardrobe
   DisplayValue: FemaleLongHair
   compatibleRaces:
   - HumanFemale
-  - HumanFemaleDCS
   wardrobeRecipeThumbs:
   - race: HumanFemale
     filename: 
     thumb: {fileID: 0}
-  - race: HumanFemaleDCS
-    filename: 
-    thumb: {fileID: 0}
   wardrobeSlot: Hair
+  Appended: 0
   Hides: []
+  HideTags: []
   suppressWardrobeSlots: []
   activeWardrobeSet: []
-  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleLongHair","scale":100,"copyIdx":-1,"overlays":[{"id":"FemaleLongHair_Overlay","colorIdx":0,"rect":[0,0,0,0],"data":[]}]}],"colors":[],"fColors":[{"name":"Hair","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0]}],"sharedColorCount":1,"race":"","packedDna":[]}'
+  MeshHideAssets: []
+  OverrideDNA:
+    PreloadValues: []
+  recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleLongHair","scale":100,"copyIdx":-1,"overlays":[{"id":"FemaleLongHair_Overlay","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0],"Tags":[],"tiling":[false,false],"uvOverride":0}],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0}],"colors":[],"fColors":[{"name":"Hair","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":1,"race":"HumanFemale","packedDna":[],"uvOverride":0}'
+  forceKeep: 0
+  labelLocalFiles: 0
+  IncompatibleRecipes: []
+  UserField: 
   replaces: Nothing