diff --git a/CharaCreator/Content/DevelopedContent/BluePrints/CharaModel.uasset b/CharaCreator/Content/DevelopedContent/BluePrints/CharaModel.uasset index 9f664e3..d75a506 100644 --- a/CharaCreator/Content/DevelopedContent/BluePrints/CharaModel.uasset +++ b/CharaCreator/Content/DevelopedContent/BluePrints/CharaModel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83010ff90a49ec2d0b072addd214c7a0c4f0b483956cd1f67efa1a18d8576171 -size 139087 +oid sha256:36971036993302616df980b3f5cbc8979540292c42a1a16656372671076945b8 +size 355828 diff --git a/CharaCreator/Content/DevelopedContent/Materials/ColourableArmsMat.uasset b/CharaCreator/Content/DevelopedContent/Materials/ColourableArmsMat.uasset new file mode 100644 index 0000000..75085ac --- /dev/null +++ b/CharaCreator/Content/DevelopedContent/Materials/ColourableArmsMat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a740378f9fbe60be96cd6c579713296e67ecd5d1960b6f305eb97dd981b242d +size 9805 diff --git a/CharaCreator/Content/DevelopedContent/Materials/ColourableLegsMat.uasset b/CharaCreator/Content/DevelopedContent/Materials/ColourableLegsMat.uasset new file mode 100644 index 0000000..16c2d8d --- /dev/null +++ b/CharaCreator/Content/DevelopedContent/Materials/ColourableLegsMat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55aba62b53ae1df767106e58cc44733e2c55ce1fc329c53cee22925ed0f2f82d +size 9828 diff --git a/CharaCreator/Content/DevelopedContent/Materials/ColourableShoesMat.uasset b/CharaCreator/Content/DevelopedContent/Materials/ColourableShoesMat.uasset new file mode 100644 index 0000000..b8b08e1 --- /dev/null +++ b/CharaCreator/Content/DevelopedContent/Materials/ColourableShoesMat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f65f86712b1b6cfad856314537e573d9841d86b6552256a45d0b7842c2dd2d6b +size 8997 diff --git a/CharaCreator/Content/DevelopedContent/Models/Material.uasset b/CharaCreator/Content/DevelopedContent/Models/Material.uasset index b024b2d..93c6f2d 100644 --- a/CharaCreator/Content/DevelopedContent/Models/Material.uasset +++ b/CharaCreator/Content/DevelopedContent/Models/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52083da8faf929f135e77ccac3441e8412f84ad5d35e674f0c11e5b0c13c69c2 -size 8968 +oid sha256:cb6466bfe2b0345831b32a38d4df587126cd890af44210114b6c6b0a3c6378d4 +size 9617 diff --git a/CharaCreator/Intermediate/CachedAssetRegistry_0.bin b/CharaCreator/Intermediate/CachedAssetRegistry_0.bin index e5d5a29..b7b40b7 100644 Binary files a/CharaCreator/Intermediate/CachedAssetRegistry_0.bin and b/CharaCreator/Intermediate/CachedAssetRegistry_0.bin differ diff --git a/CharaCreator/Intermediate/ReimportCache/3688439234.bin b/CharaCreator/Intermediate/ReimportCache/3688439234.bin index 3674124..a2dcaef 100644 Binary files a/CharaCreator/Intermediate/ReimportCache/3688439234.bin and b/CharaCreator/Intermediate/ReimportCache/3688439234.bin differ diff --git a/CharaCreator/Saved/Autosaves/Game/DevelopedContent/BluePrints/CharaModel_Auto1.uasset b/CharaCreator/Saved/Autosaves/Game/DevelopedContent/BluePrints/CharaModel_Auto1.uasset index 755a818..dbabd2e 100644 --- a/CharaCreator/Saved/Autosaves/Game/DevelopedContent/BluePrints/CharaModel_Auto1.uasset +++ b/CharaCreator/Saved/Autosaves/Game/DevelopedContent/BluePrints/CharaModel_Auto1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f86908e61308893861a7f407c7e14b0cb459641f0c790531c04c42ba9c02957e -size 21371 +oid sha256:b8a24a381ee3d4014af2580dea694a406bf8e1a534eb7bab3474880344e0f81f +size 229099 diff --git a/CharaCreator/Saved/Autosaves/PackageRestoreData.json b/CharaCreator/Saved/Autosaves/PackageRestoreData.json index c036c07..59996c2 100644 Binary files a/CharaCreator/Saved/Autosaves/PackageRestoreData.json and b/CharaCreator/Saved/Autosaves/PackageRestoreData.json differ diff --git a/CharaCreator/Saved/Config/CrashReportClient/UECC-Windows-6D9D377243E3B4FCDD0B7DB06BD917B9/CrashReportClient.ini b/CharaCreator/Saved/Config/CrashReportClient/UECC-Windows-6D9D377243E3B4FCDD0B7DB06BD917B9/CrashReportClient.ini new file mode 100644 index 0000000..e6a72c5 --- /dev/null +++ b/CharaCreator/Saved/Config/CrashReportClient/UECC-Windows-6D9D377243E3B4FCDD0B7DB06BD917B9/CrashReportClient.ini @@ -0,0 +1,7 @@ +[CrashReportClient] +bHideLogFilesOption=false +bIsAllowedToCloseWithoutSending=true +CrashConfigPurgeDays=2 +Stall.RecordDump=false +Ensure.RecordDump=true + diff --git a/CharaCreator/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini b/CharaCreator/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini index b85278e..fbf8957 100644 --- a/CharaCreator/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini +++ b/CharaCreator/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini @@ -166,6 +166,11 @@ LastLevel=/Game/DevelopedContent/Main_Map [AssetEditorSubsystem] CleanShutdown=True DebuggerAttached=False +RecentAssetEditors=MaterialEditor +RecentAssetEditors=MaterialEditor +RecentAssetEditors=MaterialEditor +RecentAssetEditors=MaterialEditor +RecentAssetEditors=MaterialEditor RecentAssetEditors=BlueprintEditor RecentAssetEditors= RecentAssetEditors= @@ -219,7 +224,7 @@ ContentBrowserDrawer.VerticalSplitter.SlotSize1=0.75 ContentBrowserDrawer.FavoriteSplitter.SlotSize0=0.200000003 ContentBrowserDrawer.FavoriteSplitter.SlotSize1=0.800000012 ContentBrowserDrawer.FavoriteSplitter.SlotSize2=0.400000006 -ContentBrowserDrawer.SelectedPaths=/Game/StarterContent/Props +ContentBrowserDrawer.SelectedPaths=/Game/DevelopedContent/Materials ContentBrowserDrawer.PluginFilters= ContentBrowserDrawer.Favorites.SelectedPaths= ContentBrowserDrawer.SelectedCollections= @@ -1317,6 +1322,8 @@ SequencerWidgets.TimeStamp=2023.11.13-17.02.24 SequencerWidgets.LastCompileMethod=External TextureEditor.TimeStamp=2023.11.13-17.02.27 TextureEditor.LastCompileMethod=Unknown +MaterialEditor.TimeStamp=2023.11.13-21.01.19 +MaterialEditor.LastCompileMethod=Unknown [Python] LastDirectory= @@ -2360,7 +2367,7 @@ CharaModel_C.Physics=True CharaModel_C.WorldPartition=True CharaModel_C.Events=True StaticMeshComponent.Variable=True -StaticMeshComponent.Sockets=True +StaticMeshComponent.Sockets=False StaticMeshComponent.ComponentTick=True StaticMeshComponent.ComponentReplication=True StaticMeshComponent.Events=True @@ -2409,16 +2416,58 @@ ArrowComponent.Tags=True ArrowComponent.ComponentReplication=True ArrowComponent.Cooking=True ArrowComponent.Events=True +PreviewMaterial.PhysicalMaterial=True +PreviewMaterial.Material=True +PreviewMaterial.PhysicalMaterialMask=True +PreviewMaterial.Nanite=True +PreviewMaterial.Translucency=True +PreviewMaterial.TranslucencySelfShadowing=True +PreviewMaterial.Usage=True +PreviewMaterial.Mobile=True +PreviewMaterial.ForwardShading=True +PreviewMaterial.PostProcessMaterial=True +PreviewMaterial.Refraction=True +PreviewMaterial.WorldPositionOffset=True +PreviewMaterial.Lightmass=True +PreviewMaterial.Previewing=True +PreviewMaterial.ImportSettings=True +MaterialExpressionVectorParameter.General=True +MaterialExpressionVectorParameter.MaterialExpressionVectorParameter=True +MaterialExpressionVectorParameter.MaterialExpression=True +MaterialExpressionVectorParameter.CustomPrimitiveData=True +MaterialExpressionVectorParameter.ParameterCustomization=True +MaterialExpressionConstant3Vector.MaterialExpressionConstant3Vector=True +MaterialExpressionConstant3Vector.MaterialExpression=True +MeshComponent.TransformCommon=True +MeshComponent.Materials=True +MeshComponent.ComponentTick=True +MeshComponent.Physics=True +MeshComponent.Collision=True +MeshComponent.HLOD=True +MeshComponent.Lighting=True +MeshComponent.PathTracing=True +MeshComponent.Rendering=True +MeshComponent.Navigation=True +MeshComponent.VirtualTexture=True +MeshComponent.Tags=True +MeshComponent.ComponentReplication=True +MeshComponent.Variable=True +MeshComponent.Cooking=True [AssetEditorSubsystemRecents] -MRUItem0=/Game/DevelopedContent/BluePrints/CharaModel -MRUItem1=/Game/DevelopedContent/BluePrints/Player_UI -MRUItem2=/Game/DevelopedContent/BluePrints/NewBlueprint -MRUItem3=/Game/DevelopedContent/Main_Map -MRUItem4=/Game/StarterContent/Maps/Advanced_Lighting -MRUItem5=/Game/StarterContent/Maps/Minimal_Default -MRUItem6=/Game/StarterContent/Maps/StarterMap -MRUItem7=/Game/StarterContent/Props/MaterialSphere +MRUItem0=/Game/DevelopedContent/Materials/ColourableShoesMat +MRUItem1=/Game/DevelopedContent/Materials/ColourableLegsMat +MRUItem2=/Game/DevelopedContent/Materials/ColourableArmsMat +MRUItem3=/Game/DevelopedContent/Models/Material +MRUItem4=/Game/StarterContent/Materials/M_Wood_Oak +MRUItem5=/Game/DevelopedContent/BluePrints/CharaModel +MRUItem6=/Game/DevelopedContent/BluePrints/Player_UI +MRUItem7=/Game/DevelopedContent/BluePrints/NewBlueprint +MRUItem8=/Game/DevelopedContent/Main_Map +MRUItem9=/Game/StarterContent/Maps/Advanced_Lighting +MRUItem10=/Game/StarterContent/Maps/Minimal_Default +MRUItem11=/Game/StarterContent/Maps/StarterMap +MRUItem12=/Game/StarterContent/Props/MaterialSphere [AssetEditorToolkitTabLocation] /Game/StarterContent/Props/MaterialSphere.MaterialSphere=1 @@ -2435,6 +2484,11 @@ None======= /Game/DevelopedContent/Textures/TXDenim.TXDenim=1 /Game/DevelopedContent/Textures/TXCloth.TXCloth=1 /Game/DevelopedContent/Textures/TXBricks.TXBricks=1 +/Game/StarterContent/Materials/M_Wood_Oak.M_Wood_Oak=1 +/Game/DevelopedContent/Models/Material.Material=1 +/Game/DevelopedContent/Materials/ColourableMaterial.ColourableMaterial=1 +/Game/DevelopedContent/Materials/ColourableLegsMat.ColourableLegsMat=1 +/Game/DevelopedContent/Materials/ColourableShoesMat.ColourableShoesMat=1 [SelectionDetails] PreserveScaleRatio=False @@ -2795,7 +2849,179 @@ K2Node_VariableGet=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper K2Node_MacroInstance=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image None======= CharaModel_C=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image +EdGraph=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image +K2Node_FunctionResult=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image +SceneComponent= +StaticMeshComponent=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image [PluginBrowser] InstalledPlugins=WMFCodecs +[/Script/UnrealEd.MaterialEditorOptions] +bHideUnrelatedNodes=False +bUseUnsortedMenus=False + +[MaterialEditor] +PrimType=1 + +[/Script/UnrealEd.MaterialStatsOptions] +bPlatformUsed[0]=0 +bPlatformUsed[1]=0 +bPlatformUsed[2]=0 +bPlatformUsed[3]=0 +bPlatformUsed[4]=0 +bPlatformUsed[5]=0 +bPlatformUsed[6]=0 +bPlatformUsed[7]=0 +bPlatformUsed[8]=0 +bPlatformUsed[9]=0 +bPlatformUsed[10]=0 +bPlatformUsed[11]=0 +bPlatformUsed[12]=0 +bPlatformUsed[13]=0 +bPlatformUsed[14]=0 +bPlatformUsed[15]=0 +bPlatformUsed[16]=0 +bPlatformUsed[17]=0 +bPlatformUsed[18]=0 +bPlatformUsed[19]=0 +bPlatformUsed[20]=0 +bPlatformUsed[21]=0 +bPlatformUsed[22]=0 +bPlatformUsed[23]=0 +bPlatformUsed[24]=0 +bPlatformUsed[25]=0 +bPlatformUsed[26]=0 +bPlatformUsed[27]=0 +bPlatformUsed[28]=0 +bPlatformUsed[29]=0 +bPlatformUsed[30]=0 +bPlatformUsed[31]=0 +bPlatformUsed[32]=0 +bPlatformUsed[33]=0 +bPlatformUsed[34]=0 +bPlatformUsed[35]=0 +bPlatformUsed[36]=0 +bPlatformUsed[37]=0 +bPlatformUsed[38]=0 +bPlatformUsed[39]=0 +bPlatformUsed[40]=0 +bPlatformUsed[41]=0 +bPlatformUsed[42]=0 +bPlatformUsed[43]=0 +bPlatformUsed[44]=0 +bPlatformUsed[45]=0 +bPlatformUsed[46]=0 +bPlatformUsed[47]=0 +bPlatformUsed[48]=0 +bPlatformUsed[49]=1 +bPlatformUsed[50]=0 +bPlatformUsed[51]=0 +bPlatformUsed[52]=0 +bPlatformUsed[53]=0 +bPlatformUsed[54]=0 +bPlatformUsed[55]=0 +bPlatformUsed[56]=0 +bPlatformUsed[57]=0 +bPlatformUsed[58]=0 +bPlatformUsed[59]=0 +bPlatformUsed[60]=0 +bPlatformUsed[61]=0 +bPlatformUsed[62]=0 +bPlatformUsed[63]=0 +bPlatformUsed[64]=0 +bPlatformUsed[65]=0 +bPlatformUsed[66]=0 +bPlatformUsed[67]=0 +bPlatformUsed[68]=0 +bPlatformUsed[69]=0 +bPlatformUsed[70]=0 +bPlatformUsed[71]=0 +bPlatformUsed[72]=0 +bPlatformUsed[73]=0 +bPlatformUsed[74]=0 +bPlatformUsed[75]=0 +bPlatformUsed[76]=0 +bPlatformUsed[77]=0 +bPlatformUsed[78]=0 +bPlatformUsed[79]=0 +bPlatformUsed[80]=0 +bPlatformUsed[81]=0 +bPlatformUsed[82]=0 +bPlatformUsed[83]=0 +bPlatformUsed[84]=0 +bPlatformUsed[85]=0 +bPlatformUsed[86]=0 +bPlatformUsed[87]=0 +bPlatformUsed[88]=0 +bPlatformUsed[89]=0 +bPlatformUsed[90]=0 +bPlatformUsed[91]=0 +bPlatformUsed[92]=0 +bPlatformUsed[93]=0 +bPlatformUsed[94]=0 +bPlatformUsed[95]=0 +bPlatformUsed[96]=0 +bPlatformUsed[97]=0 +bPlatformUsed[98]=0 +bPlatformUsed[99]=0 +bPlatformUsed[100]=0 +bPlatformUsed[101]=0 +bPlatformUsed[102]=0 +bPlatformUsed[103]=0 +bPlatformUsed[104]=0 +bPlatformUsed[105]=0 +bPlatformUsed[106]=0 +bPlatformUsed[107]=0 +bPlatformUsed[108]=0 +bPlatformUsed[109]=0 +bPlatformUsed[110]=0 +bPlatformUsed[111]=0 +bPlatformUsed[112]=0 +bPlatformUsed[113]=0 +bPlatformUsed[114]=0 +bPlatformUsed[115]=0 +bPlatformUsed[116]=0 +bPlatformUsed[117]=0 +bPlatformUsed[118]=0 +bPlatformUsed[119]=0 +bPlatformUsed[120]=0 +bPlatformUsed[121]=0 +bPlatformUsed[122]=0 +bPlatformUsed[123]=0 +bPlatformUsed[124]=0 +bPlatformUsed[125]=0 +bPlatformUsed[126]=0 +bPlatformUsed[127]=0 +bPlatformUsed[128]=0 +bPlatformUsed[129]=0 +bPlatformUsed[130]=0 +bPlatformUsed[131]=0 +bPlatformUsed[132]=0 +bPlatformUsed[133]=0 +bPlatformUsed[134]=0 +bPlatformUsed[135]=0 +bPlatformUsed[136]=0 +bPlatformUsed[137]=0 +bPlatformUsed[138]=0 +bPlatformUsed[139]=0 +bPlatformUsed[140]=0 +bPlatformUsed[141]=0 +bPlatformUsed[142]=0 +bPlatformUsed[143]=0 +bPlatformUsed[144]=0 +bPlatformUsed[145]=0 +bPlatformUsed[146]=0 +bPlatformUsed[147]=0 +bPlatformUsed[148]=0 +bPlatformUsed[149]=0 +bPlatformUsed[150]=0 +bPlatformUsed[151]=0 +bPlatformUsed[152]=0 +bPlatformUsed[153]=0 +bPlatformUsed[154]=0 +bMaterialQualityUsed[0]=0 +bMaterialQualityUsed[1]=1 +bMaterialQualityUsed[2]=0 +bMaterialQualityUsed[3]=0 + diff --git a/CharaCreator/Saved/SourceControl/UncontrolledChangelists.json b/CharaCreator/Saved/SourceControl/UncontrolledChangelists.json index 6943bd4..78c0a42 100644 --- a/CharaCreator/Saved/SourceControl/UncontrolledChangelists.json +++ b/CharaCreator/Saved/SourceControl/UncontrolledChangelists.json @@ -5,6 +5,19 @@ "guid": "00000000000000000000000000000000", "description": "Default Uncontrolled Changelist", "files": [ + "G:/cg_characreator/CharaCreator/Content/StarterContent/Particles/P_Ambient_Dust.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Character.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/BluePrints/CharaModel.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Models/CharModel.uasset", + "G:/cg_characreator/CharaCreator/Content/__ExternalActors__/DevelopedContent/Main_Map/6/O9/7AK99FQ2939KDHDRMDS01Q.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Models/cube.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Models/Material.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/BluePrints/Player_UI.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Materials/ColourableMaterial.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Materials/ColourableTorsoMat.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Materials/ColourableArmsMat.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Materials/ColourableShoesMat.uasset", + "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Materials/ColourableLegsMat.uasset", "E:/Unreal Projects/cg_characreator/CharaCreator/Content/DevelopedContent/Player_UI.uasset", "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/Models/CharModel.uasset", "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/Images/28916666-paint-buckets-color-wheel.uasset", @@ -36,16 +49,8 @@ "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/Textures/TXWood.uasset", "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/Textures/TXLeather2.uasset", "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/Textures/TXWoodenPlanks.uasset", - "G:/cg_characreator/CharaCreator/Content/StarterContent/Particles/P_Ambient_Dust.uasset", - "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Character.uasset", - "G:/cg_characreator/CharaCreator/Content/DevelopedContent/BluePrints/CharaModel.uasset", "G:/cg_characreator/CharaCreator/Content/DevelopedContent/BluePrints/Character.uasset", - "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Models/CharModel.uasset", "G:/cg_characreator/CharaCreator/Content/__ExternalActors__/DevelopedContent/Main_Map/B/U4/EWS5JI8S5SH0EXQQWW72FH.uasset", - "G:/cg_characreator/CharaCreator/Content/__ExternalActors__/DevelopedContent/Main_Map/6/O9/7AK99FQ2939KDHDRMDS01Q.uasset", - "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Models/cube.uasset", - "G:/cg_characreator/CharaCreator/Content/DevelopedContent/Models/Material.uasset", - "G:/cg_characreator/CharaCreator/Content/DevelopedContent/BluePrints/Player_UI.uasset", "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/BluePrints/Character.uasset", "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/Player_UI.uasset", "E:/Unreal Projects/cg_characreatorTea/cg_characreator/CharaCreator/Content/DevelopedContent/TPG0063AB.uasset",