diff --git a/.gitignore b/.gitignore index 261b4713..f553e7d5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ Saved Content/Blueprints/UI/Imgs/shit/screen* *BuiltData.uasset Temp -!Plugins/** +#!Plugins/** /Imgs/** **/Intermediate **/Build \ No newline at end of file diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 9451c9f1..274d409b 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -115,6 +115,8 @@ DirtyAreasUpdateFreq=60.000000 [/Script/Engine.StreamingSettings] s.UseBackgroundLevelStreaming=False +s.AsyncLoadingTimeLimit=5.000000 +s.PriorityAsyncLoadingExtraTime=10.000000 [/Script/WindowsTargetPlatform.WindowsTargetSettings] DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 diff --git a/Content/AssetPacks/Kitchen/M_Metal_Chrome.uasset b/Content/AssetPacks/Kitchen/M_Metal_Chrome.uasset index ed5962ad..d5108923 100644 Binary files a/Content/AssetPacks/Kitchen/M_Metal_Chrome.uasset and b/Content/AssetPacks/Kitchen/M_Metal_Chrome.uasset differ diff --git a/Content/AssetPacks/Kitchen/Materials/M_TileDirt.uasset b/Content/AssetPacks/Kitchen/Materials/M_TileDirt.uasset index 9fad4f9d..804ff096 100644 Binary files a/Content/AssetPacks/Kitchen/Materials/M_TileDirt.uasset and b/Content/AssetPacks/Kitchen/Materials/M_TileDirt.uasset differ diff --git a/Content/AssetPacks/xoio_berlinflat/Materials/Chrome.uasset b/Content/AssetPacks/xoio_berlinflat/Materials/Chrome.uasset index 1959ece5..f654553b 100644 Binary files a/Content/AssetPacks/xoio_berlinflat/Materials/Chrome.uasset and b/Content/AssetPacks/xoio_berlinflat/Materials/Chrome.uasset differ diff --git a/Content/AssetPacks/xoio_berlinflat/Materials/painting.uasset b/Content/AssetPacks/xoio_berlinflat/Materials/painting.uasset index 5dbe6157..8cef22b1 100644 Binary files a/Content/AssetPacks/xoio_berlinflat/Materials/painting.uasset and b/Content/AssetPacks/xoio_berlinflat/Materials/painting.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/322meshPACK_Bazic/0_BASE/DefaultTextures/T_MacroVariation.uasset b/Content/Assets/customInteriorS1tipical/322meshPACK_Bazic/0_BASE/DefaultTextures/T_MacroVariation.uasset deleted file mode 100644 index e780c091..00000000 Binary files a/Content/Assets/customInteriorS1tipical/322meshPACK_Bazic/0_BASE/DefaultTextures/T_MacroVariation.uasset and /dev/null differ diff --git a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel.uasset b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel.uasset index 70aee6e8..260e7243 100644 Binary files a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel.uasset and b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset index d271946d..15bd21f8 100644 Binary files a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset and b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset index b7068525..26050e34 100644 Binary files a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset and b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev2.uasset b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev2.uasset index d75f6711..1e358e71 100644 Binary files a/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev2.uasset and b/Content/Assets/customInteriorS1tipical/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev2.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/Meshes/SM_plintusEnd_Object1317.uasset b/Content/Assets/customInteriorS1tipical/Meshes/SM_plintusEnd_Object1317.uasset deleted file mode 100644 index be2fc77c..00000000 Binary files a/Content/Assets/customInteriorS1tipical/Meshes/SM_plintusEnd_Object1317.uasset and /dev/null differ diff --git a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel1.uasset b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel1.uasset index fb1142c1..72e93d7c 100644 Binary files a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel1.uasset and b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel1.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel2.uasset b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel2.uasset index 3ff22865..d2f8dd8d 100644 Binary files a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel2.uasset and b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel2.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel3.uasset b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel3.uasset index 9784d048..b35940e9 100644 Binary files a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel3.uasset and b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel3.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel4.uasset b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel4.uasset index e4657c1a..c8d2000b 100644 Binary files a/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel4.uasset and b/Content/Assets/customInteriorS1tipical/StarterContent/Materials/M_Metal_Brushed_Nickel4.uasset differ diff --git a/Content/Assets/customInteriorS1tipical/StarterContent/Textures/T_MacroVariation.uasset b/Content/Assets/customInteriorS1tipical/StarterContent/Textures/T_MacroVariation.uasset deleted file mode 100644 index 7f550991..00000000 Binary files a/Content/Assets/customInteriorS1tipical/StarterContent/Textures/T_MacroVariation.uasset and /dev/null differ diff --git a/Content/Assets/customInteriorS2firstFloor/322meshPACK_Bazic/0_BASE/DefaultTextures/T_MacroVariation.uasset b/Content/Assets/customInteriorS2firstFloor/322meshPACK_Bazic/0_BASE/DefaultTextures/T_MacroVariation.uasset deleted file mode 100644 index a56b0d75..00000000 Binary files a/Content/Assets/customInteriorS2firstFloor/322meshPACK_Bazic/0_BASE/DefaultTextures/T_MacroVariation.uasset and /dev/null differ diff --git a/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset b/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset index 2d7b768f..f8aabd10 100644 Binary files a/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset and b/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev.uasset differ diff --git a/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset b/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset index b8540a58..6298a9aa 100644 Binary files a/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset and b/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Elev1.uasset differ diff --git a/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Inst8.uasset b/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Inst8.uasset index 60a036ee..424dba8c 100644 Binary files a/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Inst8.uasset and b/Content/Assets/customInteriorS2firstFloor/Materials/SHARED_MATERIAL/Material/M_Metal_Brushed_Nickel_Inst8.uasset differ diff --git a/Content/Assets/customInteriorS2firstFloor/StarterContent/Textures/T_MacroVariation.uasset b/Content/Assets/customInteriorS2firstFloor/StarterContent/Textures/T_MacroVariation.uasset deleted file mode 100644 index 0c0781ed..00000000 Binary files a/Content/Assets/customInteriorS2firstFloor/StarterContent/Textures/T_MacroVariation.uasset and /dev/null differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index cd59f23e..db80c6c2 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/MathAndConvertFns.uasset b/Content/Blueprints/Player/MathAndConvertFns.uasset index 96a1bbca..36326c1a 100644 Binary files a/Content/Blueprints/Player/MathAndConvertFns.uasset and b/Content/Blueprints/Player/MathAndConvertFns.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index d6a5eb2c..44a9214c 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 298e75db..305b9dd1 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa1.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa1.uasset new file mode 100644 index 00000000..f6dce17e Binary files /dev/null and b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa__2_.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa__2_.uasset new file mode 100644 index 00000000..b80e49ef Binary files /dev/null and b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa__2_.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/btn_save.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/btn_save.uasset new file mode 100644 index 00000000..3abbb984 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/newInterface/elements/btn_save.uasset differ diff --git a/Content/TMP/icon_broni_active.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_active.uasset similarity index 63% rename from Content/TMP/icon_broni_active.uasset rename to Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_active.uasset index 4571d3ac..9aa6ab9d 100644 Binary files a/Content/TMP/icon_broni_active.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_active.uasset differ diff --git a/Content/TMP/icon_broni_normal.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_normal.uasset similarity index 67% rename from Content/TMP/icon_broni_normal.uasset rename to Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_normal.uasset index 37b7526a..2b32e567 100644 Binary files a/Content/TMP/icon_broni_normal.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_normal.uasset differ diff --git a/Content/TMP/icon_like_active.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_active.uasset similarity index 67% rename from Content/TMP/icon_like_active.uasset rename to Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_active.uasset index 94e8361f..fb249aa9 100644 Binary files a/Content/TMP/icon_like_active.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_active.uasset differ diff --git a/Content/TMP/icon_like_normal.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_normal.uasset similarity index 66% rename from Content/TMP/icon_like_normal.uasset rename to Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_normal.uasset index ea655a26..e0e38965 100644 Binary files a/Content/TMP/icon_like_normal.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_normal.uasset differ diff --git a/Content/TMP/Custom_Size-5_–_1.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_1.uasset similarity index 77% rename from Content/TMP/Custom_Size-5_–_1.uasset rename to Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_1.uasset index 70f759d0..0b5d0df9 100644 Binary files a/Content/TMP/Custom_Size-5_–_1.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_1.uasset differ diff --git a/Content/TMP/Custom_Size-5_–_3.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_3.uasset similarity index 75% rename from Content/TMP/Custom_Size-5_–_3.uasset rename to Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_3.uasset index 212457cf..73af0c03 100644 Binary files a/Content/TMP/Custom_Size-5_–_3.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_3.uasset differ diff --git a/Content/TMP/Custom_Size-5_–_4.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_4.uasset similarity index 76% rename from Content/TMP/Custom_Size-5_–_4.uasset rename to Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_4.uasset index 908c5cee..4ec959bf 100644 Binary files a/Content/TMP/Custom_Size-5_–_4.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_4.uasset differ diff --git a/Content/TMP/like.uasset b/Content/Blueprints/UI/Imgs/shit/like.uasset similarity index 77% rename from Content/TMP/like.uasset rename to Content/Blueprints/UI/Imgs/shit/like.uasset index 3b32f48f..044edb99 100644 Binary files a/Content/TMP/like.uasset and b/Content/Blueprints/UI/Imgs/shit/like.uasset differ diff --git a/Content/TMP/window_info_user__2_.uasset b/Content/Blueprints/UI/Imgs/shit/window_info_user__2_.uasset similarity index 84% rename from Content/TMP/window_info_user__2_.uasset rename to Content/Blueprints/UI/Imgs/shit/window_info_user__2_.uasset index be56793e..7f2d0afe 100644 Binary files a/Content/TMP/window_info_user__2_.uasset and b/Content/Blueprints/UI/Imgs/shit/window_info_user__2_.uasset differ diff --git a/Content/Blueprints/UI/Materials/MF_breakRGBA.uasset b/Content/Blueprints/UI/Materials/MF_breakRGBA.uasset new file mode 100644 index 00000000..cfc98995 Binary files /dev/null and b/Content/Blueprints/UI/Materials/MF_breakRGBA.uasset differ diff --git a/Content/Blueprints/UI/Materials/MF_multiboxMask.uasset b/Content/Blueprints/UI/Materials/MF_multiboxMask.uasset new file mode 100644 index 00000000..07445573 Binary files /dev/null and b/Content/Blueprints/UI/Materials/MF_multiboxMask.uasset differ diff --git a/Content/Blueprints/UI/Materials/WorldSelect.uasset b/Content/Blueprints/UI/Materials/WorldSelect.uasset index 24593195..3c8a61c1 100644 Binary files a/Content/Blueprints/UI/Materials/WorldSelect.uasset and b/Content/Blueprints/UI/Materials/WorldSelect.uasset differ diff --git a/Content/Blueprints/UI/Materials/WorldSelection.uasset b/Content/Blueprints/UI/Materials/WorldSelection.uasset index df365aa0..8299c0e8 100644 Binary files a/Content/Blueprints/UI/Materials/WorldSelection.uasset and b/Content/Blueprints/UI/Materials/WorldSelection.uasset differ diff --git a/Content/Blueprints/UI/WBPS/LoginPage.uasset b/Content/Blueprints/UI/WBPS/LoginPage.uasset index bd169ffb..4e5dbe8c 100644 Binary files a/Content/Blueprints/UI/WBPS/LoginPage.uasset and b/Content/Blueprints/UI/WBPS/LoginPage.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/Favorites.uasset b/Content/Blueprints/UI/WBPS/Menu/Favorites.uasset index c12f90b0..dacf8804 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/Favorites.uasset and b/Content/Blueprints/UI/WBPS/Menu/Favorites.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset index 3cb99ff6..873811b6 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index a2805e7a..a0f4d5c5 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/settings.uasset b/Content/Blueprints/UI/WBPS/Menu/settings.uasset index 54d040e5..25b321fe 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/settings.uasset and b/Content/Blueprints/UI/WBPS/Menu/settings.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset b/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset index 84bc1d66..739eb16e 100644 Binary files a/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset and b/Content/Blueprints/UI/WBPS/Pointers/FlatPointer.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/Filter.uasset b/Content/Blueprints/UI/WBPS/filter/Filter.uasset index fe58b89c..0ad7e382 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/Filter.uasset and b/Content/Blueprints/UI/WBPS/filter/Filter.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset index 21b609a1..e97a4efe 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset and b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset differ diff --git a/Content/Blueprints/Utils/levelPP.uasset b/Content/Blueprints/Utils/levelPP.uasset index 80f24efe..dbfb44b7 100644 Binary files a/Content/Blueprints/Utils/levelPP.uasset and b/Content/Blueprints/Utils/levelPP.uasset differ diff --git a/Content/Blueprints/Utils/worldSelectionCenter.uasset b/Content/Blueprints/Utils/worldSelectionCenter.uasset index 4349c604..3d1f76b1 100644 Binary files a/Content/Blueprints/Utils/worldSelectionCenter.uasset and b/Content/Blueprints/Utils/worldSelectionCenter.uasset differ diff --git a/Content/Instances/Fabric/MI_Fabric_tulle_2.uasset b/Content/Instances/Fabric/MI_Fabric_tulle_2.uasset index c9914592..29ac267f 100644 Binary files a/Content/Instances/Fabric/MI_Fabric_tulle_2.uasset and b/Content/Instances/Fabric/MI_Fabric_tulle_2.uasset differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index ba26e75d..50bc5b06 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/S01/S01F03.umap b/Content/Maps/S01/S01F03.umap index cbe2b2a4..51d669ba 100644 Binary files a/Content/Maps/S01/S01F03.umap and b/Content/Maps/S01/S01F03.umap differ diff --git a/Content/Maps/S01/S01F14.umap b/Content/Maps/S01/S01F14.umap index 196312fd..17506375 100644 Binary files a/Content/Maps/S01/S01F14.umap and b/Content/Maps/S01/S01F14.umap differ diff --git a/Content/Maps/S01/S01F15.umap b/Content/Maps/S01/S01F15.umap index a17f6a1b..08744fcd 100644 Binary files a/Content/Maps/S01/S01F15.umap and b/Content/Maps/S01/S01F15.umap differ diff --git a/Content/Maps/S02/S02F03.umap b/Content/Maps/S02/S02F03.umap index f2d35cd9..75a2dc3d 100644 Binary files a/Content/Maps/S02/S02F03.umap and b/Content/Maps/S02/S02F03.umap differ diff --git a/Content/Maps/S02/S02F04.umap b/Content/Maps/S02/S02F04.umap index 664d68bc..fa971b0c 100644 Binary files a/Content/Maps/S02/S02F04.umap and b/Content/Maps/S02/S02F04.umap differ diff --git a/Content/Maps/S02/S02F05.umap b/Content/Maps/S02/S02F05.umap index 474ad09f..fe78b91b 100644 Binary files a/Content/Maps/S02/S02F05.umap and b/Content/Maps/S02/S02F05.umap differ diff --git a/Content/Maps/S02/S02F07.umap b/Content/Maps/S02/S02F07.umap index f662fcb3..e3ae10c4 100644 Binary files a/Content/Maps/S02/S02F07.umap and b/Content/Maps/S02/S02F07.umap differ diff --git a/Content/Maps/S02/S02F20.umap b/Content/Maps/S02/S02F20.umap index d4c885a4..ae42f49a 100644 Binary files a/Content/Maps/S02/S02F20.umap and b/Content/Maps/S02/S02F20.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03.umap b/Content/Maps/S04/S04F03/S04F03.umap index 2cad38eb..e62f0e83 100644 Binary files a/Content/Maps/S04/S04F03/S04F03.umap and b/Content/Maps/S04/S04F03/S04F03.umap differ diff --git a/Content/Materials/M_Fabric_tulle.uasset b/Content/Materials/M_Fabric_tulle.uasset index 457f4c6f..0e82e699 100644 Binary files a/Content/Materials/M_Fabric_tulle.uasset and b/Content/Materials/M_Fabric_tulle.uasset differ diff --git a/Content/Materials/M_cap_blue.uasset b/Content/Materials/M_cap_blue.uasset new file mode 100644 index 00000000..db28f325 Binary files /dev/null and b/Content/Materials/M_cap_blue.uasset differ diff --git a/Content/Meshes/Danis/S01/SM_S01F04_WallsCap.uasset b/Content/Meshes/Danis/S01/SM_S01F04_WallsCap.uasset index 344c46bc..924674c4 100644 Binary files a/Content/Meshes/Danis/S01/SM_S01F04_WallsCap.uasset and b/Content/Meshes/Danis/S01/SM_S01F04_WallsCap.uasset differ diff --git a/Content/Meshes/Danis/S01/SM_S01F14_WallsCap.uasset b/Content/Meshes/Danis/S01/SM_S01F14_WallsCap.uasset index 25ab2a1a..0fec20ce 100644 Binary files a/Content/Meshes/Danis/S01/SM_S01F14_WallsCap.uasset and b/Content/Meshes/Danis/S01/SM_S01F14_WallsCap.uasset differ diff --git a/Content/Meshes/Danis/S01/SM_S01F15_WallsCap.uasset b/Content/Meshes/Danis/S01/SM_S01F15_WallsCap.uasset index c1d5d19c..7eee45de 100644 Binary files a/Content/Meshes/Danis/S01/SM_S01F15_WallsCap.uasset and b/Content/Meshes/Danis/S01/SM_S01F15_WallsCap.uasset differ diff --git a/Content/Meshes/Danis/S02/S02F03_WallsCap.uasset b/Content/Meshes/Danis/S02/S02F03_WallsCap.uasset index c9a2c96e..9691535f 100644 Binary files a/Content/Meshes/Danis/S02/S02F03_WallsCap.uasset and b/Content/Meshes/Danis/S02/S02F03_WallsCap.uasset differ diff --git a/Content/Meshes/Danis/S02/S02F04_WallsCap.uasset b/Content/Meshes/Danis/S02/S02F04_WallsCap.uasset index 5a694a6f..d6217f0b 100644 Binary files a/Content/Meshes/Danis/S02/S02F04_WallsCap.uasset and b/Content/Meshes/Danis/S02/S02F04_WallsCap.uasset differ diff --git a/Content/Meshes/Danis/S02/S02F05_WallsCap.uasset b/Content/Meshes/Danis/S02/S02F05_WallsCap.uasset index b323214c..96b66701 100644 Binary files a/Content/Meshes/Danis/S02/S02F05_WallsCap.uasset and b/Content/Meshes/Danis/S02/S02F05_WallsCap.uasset differ diff --git a/Content/Meshes/Danis/S02/S02F07_Cap.uasset b/Content/Meshes/Danis/S02/S02F07_Cap.uasset index c0ac387a..098fa485 100644 Binary files a/Content/Meshes/Danis/S02/S02F07_Cap.uasset and b/Content/Meshes/Danis/S02/S02F07_Cap.uasset differ diff --git a/Content/Meshes/Danis/S02/S02F20_WallsCap.uasset b/Content/Meshes/Danis/S02/S02F20_WallsCap.uasset index f122dc1e..ff3bbcb9 100644 Binary files a/Content/Meshes/Danis/S02/S02F20_WallsCap.uasset and b/Content/Meshes/Danis/S02/S02F20_WallsCap.uasset differ diff --git a/Content/Meshes/Danis/S04/SM_S04F03_WallsCap.uasset b/Content/Meshes/Danis/S04/SM_S04F03_WallsCap.uasset index fa4eac1c..c6d9f7cf 100644 Binary files a/Content/Meshes/Danis/S04/SM_S04F03_WallsCap.uasset and b/Content/Meshes/Danis/S04/SM_S04F03_WallsCap.uasset differ diff --git a/Content/TMP/bkg_anketa.uasset b/Content/TMP/bkg_anketa.uasset deleted file mode 100644 index e1325d38..00000000 Binary files a/Content/TMP/bkg_anketa.uasset and /dev/null differ diff --git a/Content/TMP/bkg_anketa__2_.uasset b/Content/TMP/bkg_anketa__2_.uasset deleted file mode 100644 index e8325326..00000000 Binary files a/Content/TMP/bkg_anketa__2_.uasset and /dev/null differ diff --git a/Content/TMP/btn_save.uasset b/Content/TMP/btn_save.uasset deleted file mode 100644 index fb581247..00000000 Binary files a/Content/TMP/btn_save.uasset and /dev/null differ diff --git a/Content/Textures/T_MacroVariation.uasset b/Content/Textures/T_MacroVariation.uasset deleted file mode 100644 index 8010efe1..00000000 Binary files a/Content/Textures/T_MacroVariation.uasset and /dev/null differ diff --git a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.dll b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.dll index 47004ad7..f4a38293 100644 Binary files a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.dll and b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.dll differ diff --git a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.pdb b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.pdb index 9cae86b4..6f785dc5 100644 Binary files a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.pdb and b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineEditor.pdb differ diff --git a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.dll b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.dll index 9eeec2a2..54e0250c 100644 Binary files a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.dll and b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.dll differ diff --git a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.pdb b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.pdb index b0935df2..697aaab9 100644 Binary files a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.pdb and b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor-HoudiniEngineRuntime.pdb differ diff --git a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor.modules b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor.modules index a314d46b..12d7d198 100644 --- a/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor.modules +++ b/Plugins/Runtime/HoudiniEngine/Binaries/Win64/UE4Editor.modules @@ -2,7 +2,7 @@ "BuildId": "13144385", "Modules": { - "HoudiniEngineEditor": "UE4Editor-HoudiniEngineEditor.dll", - "HoudiniEngineRuntime": "UE4Editor-HoudiniEngineRuntime.dll" + "HoudiniEngineEditor": "UE4Editor-HoudiniEngineEditor-0001.dll", + "HoudiniEngineRuntime": "UE4Editor-HoudiniEngineRuntime-0001.dll" } } \ No newline at end of file diff --git a/Source/Onejsky4U/Onejsky4U.Build.cs b/Source/Onejsky4U/Onejsky4U.Build.cs index bc5fa5fe..049576b2 100644 --- a/Source/Onejsky4U/Onejsky4U.Build.cs +++ b/Source/Onejsky4U/Onejsky4U.Build.cs @@ -22,6 +22,6 @@ public class Onejsky4U : ModuleRules // Add any import libraries or static libraries //Type = ModuleType.External; //PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "D:\Projects\Onejsky\libxl-3.9.4.3\lib64", "libxl.lib")); - PublicAdditionalLibraries.Add("D:\\Projects\\Onejsky\\libxl-3.9.4.3\\lib64\\libxl.lib"); + //PublicAdditionalLibraries.Add("D:\\Projects\\Onejsky\\libxl-3.9.4.3\\lib64\\libxl.lib"); } } diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp index 7ab53ef9..912377ae 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp @@ -16,19 +16,13 @@ void AOnejsky4UGameModeBase::CreateTxt(FString Path, FString FileName, FString t } -bool AOnejsky4UGameModeBase::AppendStringToFile(FString DirPath, FString FileName, FString Data) +bool AOnejsky4UGameModeBase::AppendStringToFile(FString FileName, FString Data) { // get file path FString FilePath; - if (!DirPath.Len()) - { + // default documents directory path + FileName FilePath = FPlatformProcess::UserDir() + FileName; - } - else - { - FilePath = DirPath + FileName; - } UE_LOG(LogTemp, Log, TEXT("File path: %s"), *FilePath); // check file existence and write data to a file @@ -135,4 +129,10 @@ void AOnejsky4UGameModeBase::GetExcelData(FString Command) if (book->save(L"invoice.xlsx")) book->release();*/ -} \ No newline at end of file +} + +bool AOnejsky4UGameModeBase::logFileExists(FString FileName) +{ + FString FilePath = FPlatformProcess::UserDir() + FileName;; + return FPaths::FileExists(FilePath); +} diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.h b/Source/Onejsky4U/Onejsky4UGameModeBase.h index df0fded8..18c0bb3b 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.h +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.h @@ -25,7 +25,7 @@ class ONEJSKY4U_API AOnejsky4UGameModeBase : public AGameModeBase static void CreateTxt(FString Path, FString FileName, FString text); UFUNCTION(BlueprintCallable, Category = "File") - static bool AppendStringToFile(FString DirPath, FString FileName, FString Data); + static bool AppendStringToFile(FString FileName, FString Data); UFUNCTION(BlueprintCallable, Category = "System") static void RunSystemCommand(FString Command); @@ -33,4 +33,6 @@ class ONEJSKY4U_API AOnejsky4UGameModeBase : public AGameModeBase UFUNCTION(BlueprintCallable, Category = "System") static void GetExcelData(FString Command); + UFUNCTION(BlueprintCallable, Category = "File") + static bool logFileExists(FString FileName); }; \ No newline at end of file