Skip to content

Commit b9b8fa3

Browse files
JaimiJaimi
authored
Merge pull request #449 from umasteeringgroup/Feature-13
Removed junk recipes. Fixed references in recipes. Added more info in…
2 parents b9d80a4 + 2f1fd65 commit b9b8fa3

File tree

95 files changed

+33462
-13214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+33462
-13214
lines changed

‎UMAProject/Assets/UMA/Content/Contrib/FemaleTankTop/FemaleTankTop_Recipe.asset‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@ MonoBehaviour:
1818
DisplayValue: FemaleTankTop
1919
compatibleRaces:
2020
- HumanFemale
21-
- HumanFemaleDCS
2221
wardrobeRecipeThumbs:
2322
- race: HumanFemale
2423
filename:
2524
thumb: {fileID: 0}
26-
- race: HumanFemaleDCS
27-
filename:
28-
thumb: {fileID: 0}
2925
wardrobeSlot: Chest
3026
Appended: 0
3127
Hides: []
@@ -35,7 +31,10 @@ MonoBehaviour:
3531
MeshHideAssets: []
3632
OverrideDNA:
3733
PreloadValues: []
38-
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTankTop","scale":100,"copyIdx":-1,"overlays":[{"id":"FemaleTankTop_Overlay","colorIdx":0,"rect":[0,0,0,0],"data":[]}]}],"colors":[],"fColors":[{"name":"Shirt","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":[]}'
34+
disabled: 0
35+
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTankTop","scale":100,"copyIdx":-1,"overlays":[{"id":"FemaleTankTop_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],"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,"isDisabled":false,"expandAlongNormal":0}],"colors":[],"fColors":[{"name":"Shirt","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}'
36+
forceKeep: 0
37+
labelLocalFiles: 0
3938
IncompatibleRecipes: []
4039
UserField:
4140
replaces: Nothing

‎UMAProject/Assets/UMA/Content/Contrib/MaleHoodie/MaleHoodie_Recipe.asset‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@ MonoBehaviour:
1818
DisplayValue: MaleHoodie
1919
compatibleRaces:
2020
- HumanMale
21-
- HumanMaleDCS
2221
wardrobeRecipeThumbs:
2322
- race: HumanMale
2423
filename:
2524
thumb: {fileID: 21300000, guid: 896b1aeef5871c140a99c3d9c3b7abdc, type: 3}
26-
- race: HumanMaleDCS
27-
filename:
28-
thumb: {fileID: 0}
2925
wardrobeSlot: Chest
3026
Appended: 0
3127
Hides: []
@@ -37,7 +33,8 @@ MonoBehaviour:
3733
- {fileID: 11400000, guid: f1e5cb9113e36d44f8b6da360571f611, type: 2}
3834
OverrideDNA:
3935
PreloadValues: []
40-
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"MaleHoodie","scale":100,"copyIdx":-1,"overlays":[{"id":"MaleHoodie_Overlay","colorIdx":2,"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],"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},{"id":"","scale":1,"copyIdx":-1,"overlays":[],"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":"Shirt","colors":[46,218,52,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":-13313490},{"name":"Skin","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},{"name":"-","colors":[61,69,61,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":-12761795}],"sharedColorCount":2,"race":"HumanMale","packedDna":[],"uvOverride":0}'
36+
disabled: 0
37+
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"MaleHoodie","scale":100,"copyIdx":-1,"overlays":[{"id":"MaleHoodie_Overlay","colorIdx":2,"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,"isDisabled":false,"expandAlongNormal":0},{"id":"","scale":1,"copyIdx":-1,"overlays":[],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0}],"colors":[],"fColors":[{"name":"Shirt","colors":[46,218,52,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":-13313490},{"name":"Skin","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},{"name":"-","colors":[61,69,61,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":-12761795}],"sharedColorCount":2,"race":"HumanMale","packedDna":[],"uvOverride":0}'
4138
forceKeep: 0
4239
labelLocalFiles: 0
4340
IncompatibleRecipes: []

‎UMAProject/Assets/UMA/Content/Contrib/Male_TallShoes/TallShoes_Black_Recipe.asset‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ MonoBehaviour:
1818
DisplayValue: Tall Shoes Black
1919
compatibleRaces:
2020
- HumanMale
21-
- HumanMaleDCS
2221
- HumanMaleHighPoly
2322
wardrobeRecipeThumbs:
2423
- race: HumanMale
2524
filename:
2625
thumb: {fileID: 21300000, guid: 91fdf3ffb2453404a96dfd1bb0055449, type: 3}
27-
- race: HumanMaleDCS
28-
filename:
29-
thumb: {fileID: 0}
3026
- race: HumanMaleHighPoly
3127
filename:
3228
thumb: {fileID: 0}
@@ -41,7 +37,8 @@ MonoBehaviour:
4137
MeshHideAssets: []
4238
OverrideDNA:
4339
PreloadValues: []
44-
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"TallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Black","colorIdx":1,"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],"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":"Shoes","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},{"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":1,"race":"HumanMale","packedDna":[],"uvOverride":0}'
40+
disabled: 0
41+
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"TallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Black","colorIdx":1,"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,"isDisabled":false,"expandAlongNormal":0}],"colors":[],"fColors":[{"name":"Shoes","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},{"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,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":1,"race":"HumanMale","packedDna":[],"uvOverride":0}'
4542
forceKeep: 0
4643
labelLocalFiles: 0
4744
IncompatibleRecipes: []

‎UMAProject/Assets/UMA/Content/Core/HumanFemale/DNA/HumanGirl/BonePoses/HumanMaleToBoyPose.asset‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ MonoBehaviour:
1515
poses:
1616
- bone: RightEye
1717
hash: -2120937982
18-
position: {x: 0.000000052154064, y: 0.000019621104, z: -0.000000007450581}
18+
position: {x: 0, y: 0.001, z: 0}
1919
rotation: {x: -0.00000023352396, y: 0.0000003789908, z: 0.00000021089994, w: 1.0000001}
20-
scale: {x: 1.079412, y: 1.0794117, z: 1.0794119}
20+
scale: {x: 1.2, y: 1.2, z: 1.2}
2121
category:
2222
- bone: RightGluteus
2323
hash: -2110033470
@@ -34,8 +34,8 @@ MonoBehaviour:
3434
- bone: RightFoot
3535
hash: -1693174228
3636
position: {x: 0.000000059604645, y: 0.000000004184365, z: -0.0000000113767165}
37-
rotation: {x: 0.01995789, y: 0.012473465, z: 0.043844704, w: -0.99876106}
38-
scale: {x: 1.1686273, y: 1.1686276, z: 1.1686276}
37+
rotation: {x: -0.022347651, y: 0.042676054, z: -0.04267644, w: 0.99792695}
38+
scale: {x: 1.13, y: 1.3, z: 1.3}
3939
category:
4040
- bone: LowerBackBelly
4141
hash: -1421416706
@@ -45,7 +45,7 @@ MonoBehaviour:
4545
category:
4646
- bone: Position
4747
hash: -1084586333
48-
position: {x: 0.0774, y: -0.0000000055879408, z: 4.440892e-15}
48+
position: {x: 0.06, y: -0.0000000055879408, z: 4.440892e-15}
4949
rotation: {x: 9.2814645e-14, y: 6.922167e-15, z: 9.948377e-16, w: 1}
5050
scale: {x: 0.69, y: 0.69, z: 0.69}
5151
category:
@@ -75,15 +75,15 @@ MonoBehaviour:
7575
category:
7676
- bone: LeftEye
7777
hash: 27653119
78-
position: {x: 0.000000067055225, y: -0.000019598752, z: -0.000000007450581}
78+
position: {x: 0, y: -0.001, z: 0}
7979
rotation: {x: -0.00000062380946, y: -0.00000012675716, z: 0.00000054541505, w: 1}
80-
scale: {x: 1.0794116, y: 1.0794117, z: 1.0794117}
80+
scale: {x: 1.2, y: 1.2, z: 1.2}
8181
category:
8282
- bone: Head
8383
hash: 130111906
8484
position: {x: 0.000000044703484, y: 0.0000000028979859, z: 0.000000009268909}
8585
rotation: {x: 0.000133705, y: -0.00069823733, z: 0.000690623, w: 0.9999996}
86-
scale: {x: 1.15, y: 1.3, z: 1.3}
86+
scale: {x: 1.07, y: 1.25, z: 1.35}
8787
category:
8888
- bone: LeftOuterBreast
8989
hash: 361754685
@@ -94,8 +94,8 @@ MonoBehaviour:
9494
- bone: LeftFoot
9595
hash: 1486391408
9696
position: {x: -0.00000017881393, y: -0.000000015373399, z: -0.000000020428422}
97-
rotation: {x: -0.019958908, y: 0.012474221, z: -0.043844584, w: -0.998761}
98-
scale: {x: 1.1686275, y: 1.1686275, z: 1.1686279}
97+
rotation: {x: 0.022348817, y: 0.04267601, z: 0.042676147, w: 0.9979269}
98+
scale: {x: 1.13, y: 1.3, z: 1.3}
9999
category:
100100
- bone: RightForeArm
101101
hash: 1918345642
@@ -171,15 +171,15 @@ MonoBehaviour:
171171
category:
172172
- bone: Neck
173173
hash: -2145158803
174-
position: {x: 0, y: 0, z: 0}
174+
position: {x: 0.03, y: 0, z: 0}
175175
rotation: {x: 0, y: 0, z: 0, w: 1}
176-
scale: {x: 1, y: 1, z: 1}
176+
scale: {x: 1.18, y: 1.17, z: 1.2}
177177
category:
178178
- bone: Mandible
179179
hash: 1574626840
180180
position: {x: 0, y: 0, z: 0}
181181
rotation: {x: 0, y: 0, z: 0, w: 1}
182-
scale: {x: 1, y: 0.9, z: 1}
182+
scale: {x: 1, y: 0.94, z: 1}
183183
category:
184184
- bone: RightTrapezius
185185
hash: -1174579199
@@ -223,5 +223,29 @@ MonoBehaviour:
223223
rotation: {x: 0, y: 0, z: 0, w: 1}
224224
scale: {x: 1, y: 1.2, z: 1.2}
225225
category:
226+
- bone: NeckAdjust
227+
hash: 1605701185
228+
position: {x: 0, y: 0, z: 0}
229+
rotation: {x: 0, y: 0, z: 0, w: 1}
230+
scale: {x: 2.32, y: 0.74, z: 0.68}
231+
category:
232+
- bone: NoseBase
233+
hash: -1184023893
234+
position: {x: 0, y: 0, z: 0}
235+
rotation: {x: 0, y: 0, z: 0, w: 1}
236+
scale: {x: 0.91, y: 1.1, z: 1.24}
237+
category:
238+
- bone: LeftLips
239+
hash: 1620479899
240+
position: {x: 0, y: 0.004, z: 0}
241+
rotation: {x: 0, y: 0, z: 0, w: 1}
242+
scale: {x: 1.1, y: 1, z: 1}
243+
category:
244+
- bone: RightLips
245+
hash: -1558564409
246+
position: {x: 0, y: -0.004, z: 0}
247+
rotation: {x: 0, y: 0, z: 0, w: 1}
248+
scale: {x: 1, y: 1, z: 1}
249+
category:
226250
tweenPoses: []
227251
tweenWeights: []

‎UMAProject/Assets/UMA/Content/Core/HumanFemale/RaceData/Human Female.asset‎

244 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)