diff --git a/Content/AssetPacks/ModularCity/Material/Glass/Glass_inst.uasset b/Content/AssetPacks/ModularCity/Material/Glass/Glass_inst.uasset deleted file mode 100644 index f2ec7e23..00000000 Binary files a/Content/AssetPacks/ModularCity/Material/Glass/Glass_inst.uasset and /dev/null differ diff --git a/Content/AssetPacks/ModularCity/Meshes/Road_Signs/MI_RoadSigns.uasset b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/MI_RoadSigns.uasset new file mode 100644 index 00000000..a4c85e92 Binary files /dev/null and b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/MI_RoadSigns.uasset differ diff --git a/Content/AssetPacks/ModularCity/Meshes/Road_Signs/RoadSigns.uasset b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/RoadSigns.uasset new file mode 100644 index 00000000..da731831 Binary files /dev/null and b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/RoadSigns.uasset differ diff --git a/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_BusStop_Sign.uasset b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_BusStop_Sign.uasset new file mode 100644 index 00000000..a38589e2 Binary files /dev/null and b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_BusStop_Sign.uasset differ diff --git a/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_CrossWalk_Sign.uasset b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_CrossWalk_Sign.uasset new file mode 100644 index 00000000..f35974d3 Binary files /dev/null and b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_CrossWalk_Sign.uasset differ diff --git a/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_Parking_Sign.uasset b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_Parking_Sign.uasset new file mode 100644 index 00000000..0e3a32a9 Binary files /dev/null and b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_Parking_Sign.uasset differ diff --git a/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_StopProhibited_Sign.uasset b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_StopProhibited_Sign.uasset new file mode 100644 index 00000000..37b1dbce Binary files /dev/null and b/Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_StopProhibited_Sign.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_4_Jction_BP.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_4_Jction_BP.uasset index af18a700..43ba59b4 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_4_Jction_BP.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_4_Jction_BP.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_L_Jction_Custom_BP.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_L_Jction_Custom_BP.uasset index 96a22ac5..b9b9e891 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_L_Jction_Custom_BP.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_L_Jction_Custom_BP.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_BP.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_BP.uasset index 8c01ffac..03056e5b 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_BP.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_BP.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_Without.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_Without.uasset index fb6ee7d7..8b4427a8 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_Without.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_Without.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_WithoutSidewalk.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_WithoutSidewalk.uasset index 3692b51a..290e799f 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_WithoutSidewalk.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_WithoutSidewalk.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP.uasset index 52ebb718..b6aa03b0 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP_Custom.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP_Custom.uasset index 3edddc7d..439910de 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP_Custom.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP_Custom.uasset differ diff --git a/Content/Blueprints/Building/BP_BuildingManager.uasset b/Content/Blueprints/Building/BP_BuildingManager.uasset index 42f1058b..318d94ee 100644 Binary files a/Content/Blueprints/Building/BP_BuildingManager.uasset and b/Content/Blueprints/Building/BP_BuildingManager.uasset differ diff --git a/Content/Blueprints/Building/BP_BuildingProcedural.uasset b/Content/Blueprints/Building/BP_BuildingProcedural.uasset index f72aca95..4b8cbe94 100644 Binary files a/Content/Blueprints/Building/BP_BuildingProcedural.uasset and b/Content/Blueprints/Building/BP_BuildingProcedural.uasset differ diff --git a/Content/Blueprints/DistanceRing/BP_DistanceRing.uasset b/Content/Blueprints/DistanceRing/BP_DistanceRing.uasset index 0e1a1d84..379c40e6 100644 Binary files a/Content/Blueprints/DistanceRing/BP_DistanceRing.uasset and b/Content/Blueprints/DistanceRing/BP_DistanceRing.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car_Yacht.uasset b/Content/Blueprints/LevelActors/BP_Car_Yacht.uasset deleted file mode 100644 index abec3ad9..00000000 Binary files a/Content/Blueprints/LevelActors/BP_Car_Yacht.uasset and /dev/null differ diff --git a/Content/Blueprints/Managers/BP_Controller.uasset b/Content/Blueprints/Managers/BP_Controller.uasset index b67423f6..de7672c2 100644 Binary files a/Content/Blueprints/Managers/BP_Controller.uasset and b/Content/Blueprints/Managers/BP_Controller.uasset differ diff --git a/Content/Blueprints/Managers/BP_PawnOverview.uasset b/Content/Blueprints/Managers/BP_PawnOverview.uasset index 6e4a47ed..9a2de19e 100644 Binary files a/Content/Blueprints/Managers/BP_PawnOverview.uasset and b/Content/Blueprints/Managers/BP_PawnOverview.uasset differ diff --git a/Content/Blueprints/Managers/BP_PawnWalking.uasset b/Content/Blueprints/Managers/BP_PawnWalking.uasset index 017e85a0..ee9648fa 100644 Binary files a/Content/Blueprints/Managers/BP_PawnWalking.uasset and b/Content/Blueprints/Managers/BP_PawnWalking.uasset differ diff --git a/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset b/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset index 5e685199..75b3835b 100644 Binary files a/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset and b/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset differ diff --git a/Content/Blueprints/Structures/Struct_Building.uasset b/Content/Blueprints/Structures/Struct_Building.uasset index cd080a00..52fa2258 100644 Binary files a/Content/Blueprints/Structures/Struct_Building.uasset and b/Content/Blueprints/Structures/Struct_Building.uasset differ diff --git a/Content/Blueprints/Structures/Struct_LevelsAllRC.uasset b/Content/Blueprints/Structures/Struct_LevelsAllRC.uasset index 2b7bc257..facf21b3 100644 Binary files a/Content/Blueprints/Structures/Struct_LevelsAllRC.uasset and b/Content/Blueprints/Structures/Struct_LevelsAllRC.uasset differ diff --git a/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset b/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset new file mode 100644 index 00000000..137eb25d Binary files /dev/null and b/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset differ diff --git a/Content/Freestyle/Maps/Freestyle_Developer.umap b/Content/Freestyle/Maps/Freestyle_Developer.umap index 32fa53f1..5f75d1fd 100644 Binary files a/Content/Freestyle/Maps/Freestyle_Developer.umap and b/Content/Freestyle/Maps/Freestyle_Developer.umap differ diff --git a/Content/Freestyle/Meshes/OSM/Landscape_decal_Masharov.uasset b/Content/Freestyle/Meshes/OSM/Landscape_decal_Masharov.uasset deleted file mode 100644 index 1374f323..00000000 Binary files a/Content/Freestyle/Meshes/OSM/Landscape_decal_Masharov.uasset and /dev/null differ diff --git a/Content/Furniture/All/Materials/Inst/PaintedWood/MI_PaintWood_White.uasset b/Content/Furniture/All/Materials/Inst/PaintedWood/MI_PaintWood_White.uasset index a3b9717d..1b3c4589 100644 Binary files a/Content/Furniture/All/Materials/Inst/PaintedWood/MI_PaintWood_White.uasset and b/Content/Furniture/All/Materials/Inst/PaintedWood/MI_PaintWood_White.uasset differ diff --git a/Content/HUD/Templates/UW_TemplateButton.uasset b/Content/HUD/Templates/UW_TemplateButton.uasset index 4b4a090c..cc68aea4 100644 Binary files a/Content/HUD/Templates/UW_TemplateButton.uasset and b/Content/HUD/Templates/UW_TemplateButton.uasset differ diff --git a/Content/HUD/Widgets/UW_ButtonPoint.uasset b/Content/HUD/Widgets/UW_ButtonPoint.uasset index defa6265..73703ab0 100644 Binary files a/Content/HUD/Widgets/UW_ButtonPoint.uasset and b/Content/HUD/Widgets/UW_ButtonPoint.uasset differ diff --git a/Content/Maps/L_DeveloperTactics.umap b/Content/Maps/L_DeveloperTactics.umap index 1c0f5caf..f57353cc 100644 Binary files a/Content/Maps/L_DeveloperTactics.umap and b/Content/Maps/L_DeveloperTactics.umap differ diff --git a/Content/Maps/L_Test.umap b/Content/Maps/L_Test.umap index 04da0e4a..962a1917 100644 Binary files a/Content/Maps/L_Test.umap and b/Content/Maps/L_Test.umap differ diff --git a/Content/Materials/Masters/Common/MF_Curvature.uasset b/Content/Materials/Masters/Common/MF_Curvature.uasset new file mode 100644 index 00000000..068c0996 Binary files /dev/null and b/Content/Materials/Masters/Common/MF_Curvature.uasset differ diff --git a/Content/Materials/Masters/Common/MM_Master.uasset b/Content/Materials/Masters/Common/MM_Master.uasset index 892933c2..bdf06839 100644 Binary files a/Content/Materials/Masters/Common/MM_Master.uasset and b/Content/Materials/Masters/Common/MM_Master.uasset differ diff --git a/Content/Materials/Masters/Common/svalka.uasset b/Content/Materials/Masters/Common/svalka.uasset index d810136d..1a78a5d2 100644 Binary files a/Content/Materials/Masters/Common/svalka.uasset and b/Content/Materials/Masters/Common/svalka.uasset differ diff --git a/Content/Otrada/Maps/L_Developer_Otrada.umap b/Content/Otrada/Maps/L_Developer_Otrada.umap index 5b197152..7e7e178c 100644 Binary files a/Content/Otrada/Maps/L_Developer_Otrada.umap and b/Content/Otrada/Maps/L_Developer_Otrada.umap differ diff --git a/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_ElevatorLarge_Door001.uasset b/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_ElevatorLarge_Door001.uasset index 4c04bf37..3889cfb2 100644 Binary files a/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_ElevatorLarge_Door001.uasset and b/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_ElevatorLarge_Door001.uasset differ diff --git a/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_Elevator_Door01.uasset b/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_Elevator_Door01.uasset index c158b8e9..e2754343 100644 Binary files a/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_Elevator_Door01.uasset and b/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_Elevator_Door01.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1.uasset new file mode 100644 index 00000000..f3020d5b Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset new file mode 100644 index 00000000..700ff677 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_2.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_2.uasset new file mode 100644 index 00000000..68e4b688 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_2.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2.uasset similarity index 62% rename from Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_2.uasset rename to Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2.uasset index 3d5f933a..532c26a7 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_2.uasset and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_1.uasset new file mode 100644 index 00000000..8dd88294 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_2.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_2.uasset new file mode 100644 index 00000000..81cf2133 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1.uasset new file mode 100644 index 00000000..00e8a12f Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset new file mode 100644 index 00000000..16a6f8bd Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_2.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_2.uasset new file mode 100644 index 00000000..a9cf0904 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2.uasset new file mode 100644 index 00000000..807b8cbe Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_1.uasset new file mode 100644 index 00000000..ba081755 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_2.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_2.uasset new file mode 100644 index 00000000..f91d8d4d Binary files /dev/null and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_1.uasset deleted file mode 100644 index 9346cde9..00000000 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_1.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_1.uasset deleted file mode 100644 index 74772262..00000000 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_1.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_2.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_2.uasset deleted file mode 100644 index b14615c2..00000000 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_2.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Exterior/OutsideBuildings/ReUsed/SM_ENV_Court.uasset b/Content/Taktika/Assets/Exterior/OutsideBuildings/ReUsed/SM_ENV_Court.uasset index 5bc3ece5..5095d77d 100644 Binary files a/Content/Taktika/Assets/Exterior/OutsideBuildings/ReUsed/SM_ENV_Court.uasset and b/Content/Taktika/Assets/Exterior/OutsideBuildings/ReUsed/SM_ENV_Court.uasset differ diff --git a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t100.uasset b/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t100.uasset deleted file mode 100644 index 7f92d9f8..00000000 Binary files a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t100.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t94.uasset b/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t94.uasset deleted file mode 100644 index cd25416b..00000000 Binary files a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t94.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SM_InnerYard_1.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SM_InnerYard_1.uasset new file mode 100644 index 00000000..a5fa2b55 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_InnerYard_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard_Test.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard_Test.uasset deleted file mode 100644 index f7e02917..00000000 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard_Test.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SM_TKT_Yard_Inner.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SM_TKT_Yard_Inner.uasset index b2a895bb..61da9b61 100644 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SM_TKT_Yard_Inner.uasset and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_TKT_Yard_Inner.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof1.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof1.uasset new file mode 100644 index 00000000..c6351182 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof2.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof2.uasset new file mode 100644 index 00000000..cdb4a914 Binary files /dev/null and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SandPit_2.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SandPit_2.uasset deleted file mode 100644 index d631f558..00000000 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SandPit_2.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Interior/Appartments/SM_Stairs_001.uasset b/Content/Taktika/Assets/Interior/Appartments/SM_Stairs_001.uasset index 9e8351f5..07de1038 100644 Binary files a/Content/Taktika/Assets/Interior/Appartments/SM_Stairs_001.uasset and b/Content/Taktika/Assets/Interior/Appartments/SM_Stairs_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_AI.uasset b/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_AI.uasset index 2b6f0e31..9953b87b 100644 Binary files a/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_AI.uasset and b/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_AI.uasset differ diff --git a/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_Frame.uasset b/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_Frame.uasset index e04eb4d7..22d2b4ac 100644 Binary files a/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_Frame.uasset and b/Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_Frame.uasset differ diff --git a/Content/Taktika/Assets/Interior/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset b/Content/Taktika/Assets/Interior/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset index 0cdf7213..19483ac5 100644 Binary files a/Content/Taktika/Assets/Interior/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset and b/Content/Taktika/Assets/Interior/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset differ diff --git a/Content/Taktika/Assets/Interior/Plintus/SM_S02F05A03_Plintis_Test.uasset b/Content/Taktika/Assets/Interior/Plintus/SM_S02F05A03_Plintis_Test.uasset deleted file mode 100644 index fca63c63..00000000 Binary files a/Content/Taktika/Assets/Interior/Plintus/SM_S02F05A03_Plintis_Test.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Interior/WallsCaps/S01F03_WallsCaps.uasset b/Content/Taktika/Assets/Interior/WallsCaps/S01F03_WallsCaps.uasset index a6d44217..09174067 100644 Binary files a/Content/Taktika/Assets/Interior/WallsCaps/S01F03_WallsCaps.uasset and b/Content/Taktika/Assets/Interior/WallsCaps/S01F03_WallsCaps.uasset differ diff --git a/Content/Taktika/Assets/Interior/WallsCaps/S01F04_WallsCaps.uasset b/Content/Taktika/Assets/Interior/WallsCaps/S01F04_WallsCaps.uasset index b9f9efcc..d04c0d78 100644 Binary files a/Content/Taktika/Assets/Interior/WallsCaps/S01F04_WallsCaps.uasset and b/Content/Taktika/Assets/Interior/WallsCaps/S01F04_WallsCaps.uasset differ diff --git a/Content/Taktika/Assets/Interior/WallsCaps/S01F05_WallsCaps.uasset b/Content/Taktika/Assets/Interior/WallsCaps/S01F05_WallsCaps.uasset index a57f042c..9ba5822c 100644 Binary files a/Content/Taktika/Assets/Interior/WallsCaps/S01F05_WallsCaps.uasset and b/Content/Taktika/Assets/Interior/WallsCaps/S01F05_WallsCaps.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorL_90_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorL_90_001.uasset index f3ddff14..b9833de5 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorL_90_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorL_90_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_80_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_80_001.uasset index 5d6a5cc8..c4b71c05 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_80_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_80_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_90_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_90_001.uasset index db48e9e2..dd700cc8 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_90_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_90_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_DoorMOP_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_DoorMOP_001.uasset deleted file mode 100644 index e44c86b1..00000000 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_DoorMOP_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorL_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorL_001.uasset index df693c68..5d2f70b7 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorL_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorL_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorR_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorR_001.uasset index 7fcc4dbb..8e1924a4 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorR_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorR_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_001.uasset index 02546e88..19b6db58 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_003.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_003.uasset index 01660303..ea73258b 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_003.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_003.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_004.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_004.uasset index bb61a951..6932ea79 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_004.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_004.uasset differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorAround.uasset b/Content/Taktika/Assets/MOP/SM_DoorAround.uasset deleted file mode 100644 index d2887bd8..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorAround.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorILargeClosed_1-2_001.uasset b/Content/Taktika/Assets/MOP/SM_DoorILargeClosed_1-2_001.uasset deleted file mode 100644 index 45ac7f49..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorILargeClosed_1-2_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorILargeOpened_001.uasset b/Content/Taktika/Assets/MOP/SM_DoorILargeOpened_001.uasset deleted file mode 100644 index a8e92144..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorILargeOpened_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorMOP_001.uasset b/Content/Taktika/Assets/MOP/SM_DoorMOP_001.uasset index 3759e6a7..116fbd0c 100644 Binary files a/Content/Taktika/Assets/MOP/SM_DoorMOP_001.uasset and b/Content/Taktika/Assets/MOP/SM_DoorMOP_001.uasset differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorMOP_002.uasset b/Content/Taktika/Assets/MOP/SM_DoorMOP_002.uasset deleted file mode 100644 index 65fc000f..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorMOP_002.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorMOP_005.uasset b/Content/Taktika/Assets/MOP/SM_DoorMOP_005.uasset deleted file mode 100644 index 87b7b017..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorMOP_005.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_001.uasset b/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_001.uasset deleted file mode 100644 index e407019b..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_002.uasset b/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_002.uasset deleted file mode 100644 index a97086b2..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_002.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_004.uasset b/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_004.uasset deleted file mode 100644 index ff9eedff..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_004.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_005.uasset b/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_005.uasset deleted file mode 100644 index 08a11849..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_005.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_ElevatorOutside_002.uasset b/Content/Taktika/Assets/MOP/SM_ElevatorOutside_002.uasset index 785fb94b..15ae5e45 100644 Binary files a/Content/Taktika/Assets/MOP/SM_ElevatorOutside_002.uasset and b/Content/Taktika/Assets/MOP/SM_ElevatorOutside_002.uasset differ diff --git a/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_180_001.uasset b/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_180_001.uasset deleted file mode 100644 index f9fe2b96..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_180_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_80_001.uasset b/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_80_001.uasset deleted file mode 100644 index 74b08c6c..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_80_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P2_140_001.uasset b/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P2_140_001.uasset deleted file mode 100644 index 6d2aa1cd..00000000 Binary files a/Content/Taktika/Assets/MOP/SM_S01F01_Windows_P2_140_001.uasset and /dev/null differ diff --git a/Content/Taktika/BP/BP_Lamp_Hall_TKT.uasset b/Content/Taktika/BP/BP_Lamp_Hall_TKT.uasset index 58d1f913..6296cc7a 100644 Binary files a/Content/Taktika/BP/BP_Lamp_Hall_TKT.uasset and b/Content/Taktika/BP/BP_Lamp_Hall_TKT.uasset differ diff --git a/Content/Taktika/BP/BP_Lamp_Hall_TKT_2.uasset b/Content/Taktika/BP/BP_Lamp_Hall_TKT_2.uasset index aa9ac1a2..d12e82fc 100644 Binary files a/Content/Taktika/BP/BP_Lamp_Hall_TKT_2.uasset and b/Content/Taktika/BP/BP_Lamp_Hall_TKT_2.uasset differ diff --git a/Content/Taktika/BP/BP_Lamp_Hall_TKT_Long.uasset b/Content/Taktika/BP/BP_Lamp_Hall_TKT_Long.uasset index a7fc8428..5f0c6ae3 100644 Binary files a/Content/Taktika/BP/BP_Lamp_Hall_TKT_Long.uasset and b/Content/Taktika/BP/BP_Lamp_Hall_TKT_Long.uasset differ diff --git a/Content/Taktika/BP/BP_LightLampMOP.uasset b/Content/Taktika/BP/BP_LightLampMOP.uasset index 47857d8c..87a400ae 100644 Binary files a/Content/Taktika/BP/BP_LightLampMOP.uasset and b/Content/Taktika/BP/BP_LightLampMOP.uasset differ diff --git a/Content/Taktika/BP/Light_4Bake_025.uasset b/Content/Taktika/BP/Light_4Bake_025.uasset deleted file mode 100644 index 09980426..00000000 Binary files a/Content/Taktika/BP/Light_4Bake_025.uasset and /dev/null differ diff --git a/Content/Taktika/Landscape_Decals/Landscape_decal_TKT.uasset b/Content/Taktika/Landscape_Decals/Landscape_decal_TKT.uasset index bfd0644a..d8e6943b 100644 Binary files a/Content/Taktika/Landscape_Decals/Landscape_decal_TKT.uasset and b/Content/Taktika/Landscape_Decals/Landscape_decal_TKT.uasset differ diff --git a/Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap b/Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap index 12512b96..3cf34765 100644 Binary files a/Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap and b/Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F01_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S01F01_Interior.umap index 0d941b41..1fed952f 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F01_Interior.umap and b/Content/Taktika/Maps/Interior/TKT_S01F01_Interior.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F02_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S01F02_Interior.umap index 6d1b1892..5512cfd8 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F02_Interior.umap and b/Content/Taktika/Maps/Interior/TKT_S01F02_Interior.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F03_Furniture.umap b/Content/Taktika/Maps/Interior/TKT_S01F03_Furniture.umap deleted file mode 100644 index 671c4923..00000000 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F03_Furniture.umap and /dev/null differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap index 1b05e93e..132f1f9b 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap and b/Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F03_Reflection.umap b/Content/Taktika/Maps/Interior/TKT_S01F03_Reflection.umap deleted file mode 100644 index 31ad8698..00000000 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F03_Reflection.umap and /dev/null differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F04_Furniture.umap b/Content/Taktika/Maps/Interior/TKT_S01F04_Furniture.umap deleted file mode 100644 index e56f3c00..00000000 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F04_Furniture.umap and /dev/null differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F04_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S01F04_Interior.umap index 8a7e929b..e85eb34a 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F04_Interior.umap and b/Content/Taktika/Maps/Interior/TKT_S01F04_Interior.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F04_Reflection.umap b/Content/Taktika/Maps/Interior/TKT_S01F04_Reflection.umap deleted file mode 100644 index 166d7a9f..00000000 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F04_Reflection.umap and /dev/null differ diff --git a/Content/Taktika/Maps/Interior/TKT_S02F01_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S02F01_Interior.umap index 780373c8..2b199bee 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S02F01_Interior.umap and b/Content/Taktika/Maps/Interior/TKT_S02F01_Interior.umap differ diff --git a/Content/Taktika/Maps/TKT_Cars.umap b/Content/Taktika/Maps/TKT_Cars.umap index f948342c..ea344f7b 100644 Binary files a/Content/Taktika/Maps/TKT_Cars.umap and b/Content/Taktika/Maps/TKT_Cars.umap differ diff --git a/Content/Taktika/Maps/TKT_Day_Light.umap b/Content/Taktika/Maps/TKT_Day_Light.umap index 7ff8332f..028e4366 100644 Binary files a/Content/Taktika/Maps/TKT_Day_Light.umap and b/Content/Taktika/Maps/TKT_Day_Light.umap differ diff --git a/Content/Taktika/Maps/TKT_Exterior.umap b/Content/Taktika/Maps/TKT_Exterior.umap index 57c3956a..cd7166ad 100644 Binary files a/Content/Taktika/Maps/TKT_Exterior.umap and b/Content/Taktika/Maps/TKT_Exterior.umap differ diff --git a/Content/Taktika/Maps/TKT_Landscape.umap b/Content/Taktika/Maps/TKT_Landscape.umap index 703d87c3..3fb06ae5 100644 Binary files a/Content/Taktika/Maps/TKT_Landscape.umap and b/Content/Taktika/Maps/TKT_Landscape.umap differ diff --git a/Content/Taktika/Maps/TKT_Light.umap b/Content/Taktika/Maps/TKT_Light.umap deleted file mode 100644 index 17012b20..00000000 Binary files a/Content/Taktika/Maps/TKT_Light.umap and /dev/null differ diff --git a/Content/Taktika/Maps/TKT_MainScene.umap b/Content/Taktika/Maps/TKT_MainScene.umap index 9858ca4c..5a9bdd64 100644 Binary files a/Content/Taktika/Maps/TKT_MainScene.umap and b/Content/Taktika/Maps/TKT_MainScene.umap differ diff --git a/Content/Taktika/Maps/TKT_OutsideBuildings.umap b/Content/Taktika/Maps/TKT_OutsideBuildings.umap index d36741a4..704fb417 100644 Binary files a/Content/Taktika/Maps/TKT_OutsideBuildings.umap and b/Content/Taktika/Maps/TKT_OutsideBuildings.umap differ diff --git a/Content/Taktika/Maps/TKT_Roads.umap b/Content/Taktika/Maps/TKT_Roads.umap index fc180c71..a290465e 100644 Binary files a/Content/Taktika/Maps/TKT_Roads.umap and b/Content/Taktika/Maps/TKT_Roads.umap differ diff --git a/Content/Taktika/Maps/TKT_Roads_Bake.umap b/Content/Taktika/Maps/TKT_Roads_Bake.umap new file mode 100644 index 00000000..37153cb8 Binary files /dev/null and b/Content/Taktika/Maps/TKT_Roads_Bake.umap differ diff --git a/Content/Taktika/Maps/TKT_Yard.umap b/Content/Taktika/Maps/TKT_Yard.umap index 228532c6..6b5edd60 100644 Binary files a/Content/Taktika/Maps/TKT_Yard.umap and b/Content/Taktika/Maps/TKT_Yard.umap differ diff --git a/Content/Taktika/Maps/TKT_people.umap b/Content/Taktika/Maps/TKT_people.umap index a9bad746..d3731a0f 100644 Binary files a/Content/Taktika/Maps/TKT_people.umap and b/Content/Taktika/Maps/TKT_people.umap differ diff --git a/Content/Taktika/Materials/Instances/Custom/Palette/MI_Color_21.uasset b/Content/Taktika/Materials/Instances/Custom/Palette/MI_Color_21.uasset deleted file mode 100644 index 6dbd1652..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Palette/MI_Color_21.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/MI_DoorFade_Wood_Grey_TKT.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/MI_DoorFade_Wood_Grey_TKT.uasset deleted file mode 100644 index 188e74ef..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/MI_DoorFade_Wood_Grey_TKT.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Door_Metal_Gold_Fade_TKT2.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/MI_Door_Metal_Gold_Fade_TKT2.uasset deleted file mode 100644 index a7363cb5..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Door_Metal_Gold_Fade_TKT2.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Metal_Black1.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/MI_Metal_Black1.uasset deleted file mode 100644 index b1321418..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Metal_Black1.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Black_TKT2.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Black_TKT2.uasset deleted file mode 100644 index c76b0c06..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Black_TKT2.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Black_TKT4.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Black_TKT4.uasset deleted file mode 100644 index d8b465bc..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Black_TKT4.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Grey_TKT_Plintus1.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Grey_TKT_Plintus1.uasset deleted file mode 100644 index fac8da5a..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Grey_TKT_Plintus1.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Grey_TKT_Plintus2.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Grey_TKT_Plintus2.uasset deleted file mode 100644 index cd49cd68..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/MI_Wood_Grey_TKT_Plintus2.uasset and /dev/null differ diff --git a/Content/Taktika/Materials/Instances/Custom/Wood/_NormalMI_Wood_Grey_TKT_5.uasset b/Content/Taktika/Materials/Instances/Custom/Wood/_NormalMI_Wood_Grey_TKT_5.uasset deleted file mode 100644 index 39f478e6..00000000 Binary files a/Content/Taktika/Materials/Instances/Custom/Wood/_NormalMI_Wood_Grey_TKT_5.uasset and /dev/null differ diff --git a/Content/Tradicio/Maps/L_DeveloperTradition.umap b/Content/Tradicio/Maps/L_DeveloperTradition.umap index 319211db..0fe127db 100644 Binary files a/Content/Tradicio/Maps/L_DeveloperTradition.umap and b/Content/Tradicio/Maps/L_DeveloperTradition.umap differ diff --git a/Source/FORTIS_Taktika/Private/ResComFloorManager.cpp b/Source/FORTIS_Taktika/Private/ResComFloorManager.cpp index 41fb0ef0..c705eb1b 100644 --- a/Source/FORTIS_Taktika/Private/ResComFloorManager.cpp +++ b/Source/FORTIS_Taktika/Private/ResComFloorManager.cpp @@ -45,6 +45,19 @@ void AResComFloorManager::AddLevelToPack(FApartmentLocation loc, FFloorLevelStre } } +bool AResComFloorManager::GetPack(FApartmentLocation loc, FFloorPack* pack) +{ + for (int i = 0; i < packs.Num(); ++i) + { + if (packs[i].location == loc) + { + pack = &(packs[i]); + return true; + } + } + return false; +} + bool AResComFloorManager::GetPack(FApartmentLocation loc, FFloorPack& pack) const { for (auto& packCurr : packs) @@ -58,45 +71,22 @@ bool AResComFloorManager::GetPack(FApartmentLocation loc, FFloorPack& pack) cons return false; } -bool AResComFloorManager::LoadPack(FApartmentLocation loc, const FOnPreview& delegatePreview, const FOnShouldBeVisible& delegateShouldBeVisible, const FOnShouldBeLoaded& delegateShouldBeLoaded) +//bool AResComFloorManager::LoadPack(FApartmentLocation loc, const FOnPreview& delegatePreview, const FOnShouldBeVisible& delegateShouldBeVisible, const FOnShouldBeLoaded& delegateShouldBeLoaded) +bool AResComFloorManager::LoadPack(FApartmentLocation loc, const FOnLoaded& delegateOnLoaded) { - FFloorPack pack; + FFloorPack* pack = nullptr; if (!GetPack(loc, pack)) return false; + + OnLoaded = delegateOnLoaded; + //OnPreview = delegatePreview; + //OnShouldBeVisible = delegateShouldBeVisible; + //OnShouldBeLoaded = delegateShouldBeLoaded; - OnPreview = delegatePreview; - OnShouldBeVisible = delegateShouldBeVisible; - OnShouldBeLoaded = delegateShouldBeLoaded; - - FLatentActionInfo latentInfo; - latentInfo.CallbackTarget = this; - latentInfo.UUID = 0; - latentInfo.Linkage = 0; - - - /*latentInfo.ExecutionFunction = "OnLevelPreview"; - for (auto& level : pack.levelsPreview) - { - ++queueElem.visibleCnt; - ++latentInfo.UUID; - UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); - } - - latentInfo.ExecutionFunction = "OnLevelVisible"; - for (auto& level : pack.levelsShouldBeVisible) - { - ++queueElem.previewCnt; - ++latentInfo.UUID; - UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); - } - - latentInfo.ExecutionFunction = "OnLevelLoaded"; - for (auto& level : pack.levelsShouldBeLoaded) - { - queueElem.loadedCnt; - ++latentInfo.UUID; - UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); - }*/ + FVector Location(0.0f, 0.0f, 0.0f); + FRotator Rotation(0.0f, 0.0f, 0.0f); + FActorSpawnParameters SpawnInfo; + GetWorld()->SpawnActor(Location, Rotation, SpawnInfo); return true; } diff --git a/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp b/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp new file mode 100644 index 00000000..324cf0f4 --- /dev/null +++ b/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp @@ -0,0 +1,64 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "ResComLevelPackLoader.h" + +// Sets default values +AResComLevelPackLoader::AResComLevelPackLoader() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; + PrimaryActorTick.TickInterval = 0.5f; + +} + +// Called when the game starts or when spawned +void AResComLevelPackLoader::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void AResComLevelPackLoader::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + + if (packLoading->IsLoaded()) + { + Destroy(); + } +} + +void AResComLevelPackLoader::LoadPack(FFloorPack* pack) +{ + FLatentActionInfo latentInfo; + latentInfo.CallbackTarget = this; + latentInfo.UUID = 0; + latentInfo.Linkage = 0; + + latentInfo.ExecutionFunction = "OnLevelPreview"; + for (auto& level : pack.levelsPreview) + { + ++queueElem.visibleCnt; + ++latentInfo.UUID; + UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); + } + + latentInfo.ExecutionFunction = "OnLevelVisible"; + for (auto& level : pack.levelsShouldBeVisible) + { + ++queueElem.previewCnt; + ++latentInfo.UUID; + UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); + } + + latentInfo.ExecutionFunction = "OnLevelLoaded"; + for (auto& level : pack.levelsShouldBeLoaded) + { + queueElem.loadedCnt; + ++latentInfo.UUID; + UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); + } + return true; +} \ No newline at end of file diff --git a/Source/FORTIS_Taktika/Public/ResComFloorManager.h b/Source/FORTIS_Taktika/Public/ResComFloorManager.h index daf468ca..36b4b8a3 100644 --- a/Source/FORTIS_Taktika/Public/ResComFloorManager.h +++ b/Source/FORTIS_Taktika/Public/ResComFloorManager.h @@ -1,6 +1,7 @@ // Fill out your copyright notice in the Description page of Project Settings. #pragma once +#include "ResComLevelPackLoader.h" #include "Engine/LevelStreaming.h" #include "Kismet/GameplayStatics.h" #include "ResComApartmentManager.h" @@ -13,6 +14,7 @@ DECLARE_DYNAMIC_DELEGATE(FOnPreview); DECLARE_DYNAMIC_DELEGATE(FOnShouldBeVisible); DECLARE_DYNAMIC_DELEGATE(FOnShouldBeLoaded); +DECLARE_DYNAMIC_DELEGATE(FOnLoaded); UENUM(BlueprintType) enum Enum_LevelType @@ -47,6 +49,23 @@ struct FFloorPack UPROPERTY(EditAnywhere, BlueprintReadWrite) TArray levels; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool loaded = false; + + bool IsLoaded() + { + loaded = false; + for (auto& level : levels) + { + if (!IsValid(level.level)) + return loaded; + if (!(level.level->IsLevelVisible())) + return loaded; + } + loaded = true; + return loaded; + } }; UCLASS() @@ -63,6 +82,7 @@ private: void OnLevelVisible(); UFUNCTION() void OnLevelLoaded(); + bool GetPack(FApartmentLocation loc, FFloorPack* pack); public: // Sets default values for this actor's properties AResComFloorManager(); @@ -78,6 +98,8 @@ protected: FOnShouldBeVisible OnShouldBeVisible; UPROPERTY() FOnShouldBeLoaded OnShouldBeLoaded; + UPROPERTY() + FOnLoaded OnLoaded; UFUNCTION(BlueprintCallable, Category = "Pack") void AddLevelToPack(FApartmentLocation loc, FFloorLevelStreaming level); @@ -93,7 +115,8 @@ public: virtual void Tick(float DeltaTime) override; UFUNCTION(BlueprintCallable, Category="Pack") - bool LoadPack(FApartmentLocation loc, const FOnPreview& delegatePreview, const FOnShouldBeVisible& delegateShouldBeVisible, const FOnShouldBeLoaded& delegateShouldBeLoaded); + //bool LoadPack(FApartmentLocation loc, const FOnPreview& delegatePreview, const FOnShouldBeVisible& delegateShouldBeVisible, const FOnShouldBeLoaded& delegateShouldBeLoaded); + bool LoadPack(FApartmentLocation loc, const FOnLoaded& delegateOnLoaded); UFUNCTION(BlueprintCallable, Category = "Pack") bool UnloadPack(FApartmentLocation loc, const FOnPreview& delegatePreview, const FOnShouldBeVisible& delegateShouldBeVisible, const FOnShouldBeLoaded& delegateShouldBeLoaded); diff --git a/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h b/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h new file mode 100644 index 00000000..c88fc492 --- /dev/null +++ b/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h @@ -0,0 +1,30 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "ResComFloorManager.h" +#include "CoreMinimal.h" +#include "GameFramework/Actor.h" +#include "ResComLevelPackLoader.generated.h" + +UCLASS() +class FORTIS_TAKTIKA_API AResComLevelPackLoader : public AActor +{ + GENERATED_BODY() +private: + FFloorPack* packLoading; +public: + // Sets default values for this actor's properties + AResComLevelPackLoader(); + AResComLevelPackLoader(FFloorPack* pack) : packLoading(pack){} + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + void LoadPack(FFloorPack* pack); + +};