squash commits
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b5227a6c1bad2604ca77391927f16076
|
||||
folderAsset: yes
|
||||
timeCreated: 1486770455
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 03e5bfa4f7f2fd445974ed61bdf5d9cf
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Body/M_Bod Overlay 1.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d9dc97ec6d7fc0f46ae9f479ce051897
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Body/M_Bod Overlay 2.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f57c699e06562b84fb91461077d470a9
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Body/M_Bod smooth.asset
|
||||
uploadId: 679826
|
||||
@@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a96f72f61120b674db56e7a9f33aed9c
|
||||
folderAsset: yes
|
||||
timeCreated: 1486770578
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4559a01221d4aa540bb720979b99c28f
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Complexion/Body Freckles.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 060710660a79b9549b07a47ba0c1fbe2
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Complexion/Body Hair.asset
|
||||
uploadId: 679826
|
||||
@@ -0,0 +1,33 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 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: BodyHair
|
||||
m_EditorClassIdentifier:
|
||||
label:
|
||||
resourcesOnly: 0
|
||||
recipeType: Wardrobe
|
||||
DisplayValue:
|
||||
compatibleRaces: []
|
||||
wardrobeRecipeThumbs: []
|
||||
wardrobeSlot: None
|
||||
Appended: 1
|
||||
Hides: []
|
||||
HideTags: []
|
||||
suppressWardrobeSlots: []
|
||||
activeWardrobeSet: []
|
||||
MeshHideAssets: []
|
||||
OverrideDNA:
|
||||
PreloadValues: []
|
||||
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[],"colors":[],"fColors":[],"sharedColorCount":0,"race":"","packedDna":[]}'
|
||||
IncompatibleRecipes: []
|
||||
UserField:
|
||||
replaces: Nothing
|
||||
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 79a29ae7865aaef479c552e5b2bbc4ec
|
||||
labels:
|
||||
- UMA_Text Recipe
|
||||
- UMA_Wardrobe Recipe
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Complexion/BodyHair.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a209ee514b60b9044bdef1bcbf69967d
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Complexion/Skin Patches.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1320201c90abfb148ba70377406b5dc4
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Complexion/Skin patches Face.asset
|
||||
uploadId: 679826
|
||||
@@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3574615b82f90aa4c865e053c95a43d7
|
||||
folderAsset: yes
|
||||
timeCreated: 1486770492
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b4513bf429a9e5648b4937fa4469105f
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Face/M_Eyelash.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c857aa47837303d4aa8696115dc0f618
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Face/M_Face 1 eyebrows 2.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 871aaf528aaccab43bcd294322f9aaaf
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Face/M_Face Spots.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 19ca51fa9b344074ebeaad4c873fd125
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Face/M_Face.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 74fbe497c697690488fbdfeee0fae3d6
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Face/M_Face_Spots.asset
|
||||
uploadId: 679826
|
||||
@@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2323f70975429d64e85488fb820a4193
|
||||
folderAsset: yes
|
||||
timeCreated: 1484963248
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 218bd6274a70059449c259a6176e66b2
|
||||
folderAsset: yes
|
||||
timeCreated: 1426777785
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Binary file not shown.
+18
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5485425746189d647a627abc4e2f06e9
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Face/SwappedHead/Human Male
|
||||
PigNose/MaleHead_PigNose.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a60d5c517fee0ce48b5b59b9ed45861e
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Core/HumanMale/Overlays/Face/SwappedHead/MaleFace01.asset
|
||||
uploadId: 679826
|
||||
Reference in New Issue
Block a user