diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 0db8e7cd..047284a1 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -142,6 +142,7 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_System_Click) +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Menu_Click) +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Menu_Click) ++ActionMappings=(ActionName="EXIT_APPLICATION",bShift=True,bCtrl=True,bAlt=True,bCmd=False,Key=None) +AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) +AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis) +AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) diff --git a/Content/AssetPacks/BlackAlder/Geometry/MI_BlackAlder.uasset b/Content/AssetPacks/BlackAlder/Geometry/MI_BlackAlder.uasset new file mode 100644 index 00000000..9a5c2bd0 Binary files /dev/null and b/Content/AssetPacks/BlackAlder/Geometry/MI_BlackAlder.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP.uasset b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP.uasset index f2311da1..2a5dfea6 100644 Binary files a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP.uasset and b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP_FoliageType.uasset b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP_FoliageType.uasset index 7ff47ef4..13b56a6c 100644 Binary files a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP_FoliageType.uasset and b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_01_PP_FoliageType.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP.uasset b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP.uasset index 6966fc9c..6ba99a67 100644 Binary files a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP.uasset and b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP_FoliageType.uasset b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP_FoliageType.uasset index e59ee749..e6d849a2 100644 Binary files a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP_FoliageType.uasset and b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_02_PP_FoliageType.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP.uasset b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP.uasset index e55ed8cd..1151143b 100644 Binary files a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP.uasset and b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP_FoliageType.uasset b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP_FoliageType.uasset index 3a190f4c..79d5c66a 100644 Binary files a/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP_FoliageType.uasset and b/Content/AssetPacks/BlackAlder/Geometry/PivotPainter/SM_BlackAlder_Field_03_PP_FoliageType.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/SM_BlackAlder_Field_01_PP.uasset b/Content/AssetPacks/BlackAlder/Geometry/SM_BlackAlder_Field_01_PP.uasset new file mode 100644 index 00000000..0e9f5fa8 Binary files /dev/null and b/Content/AssetPacks/BlackAlder/Geometry/SM_BlackAlder_Field_01_PP.uasset differ diff --git a/Content/AssetPacks/BlackAlder/Geometry/SM_BlackAlder_Field_02_PP.uasset b/Content/AssetPacks/BlackAlder/Geometry/SM_BlackAlder_Field_02_PP.uasset new file mode 100644 index 00000000..0167b1b6 Binary files /dev/null and b/Content/AssetPacks/BlackAlder/Geometry/SM_BlackAlder_Field_02_PP.uasset differ diff --git a/Content/AssetPacks/ModularCity/Material/Master_Materials/Master_Decal_Material.uasset b/Content/AssetPacks/ModularCity/Material/Master_Materials/Master_Decal_Material.uasset index d5d246cb..aa34f64b 100644 Binary files a/Content/AssetPacks/ModularCity/Material/Master_Materials/Master_Decal_Material.uasset and b/Content/AssetPacks/ModularCity/Material/Master_Materials/Master_Decal_Material.uasset differ diff --git a/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Inst.uasset b/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Inst.uasset index 3ed82b7b..1291f1cd 100644 Binary files a/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Inst.uasset and b/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Inst.uasset differ diff --git a/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Var2_Inst1.uasset b/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Var2_Inst1.uasset index 627d8f9c..d182601f 100644 Binary files a/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Var2_Inst1.uasset and b/Content/AssetPacks/ModularCity/Material/Road_Asphalt/MI_RoadPatches_Var2_Inst1.uasset differ diff --git a/Content/AssetPacks/ProceduralRoadGenerator/Modules/Road_Lamp_One_Side_Var1_BP.uasset b/Content/AssetPacks/ProceduralRoadGenerator/Modules/Road_Lamp_One_Side_Var1_BP.uasset index 212daa45..e7cf8ead 100644 Binary files a/Content/AssetPacks/ProceduralRoadGenerator/Modules/Road_Lamp_One_Side_Var1_BP.uasset and b/Content/AssetPacks/ProceduralRoadGenerator/Modules/Road_Lamp_One_Side_Var1_BP.uasset differ diff --git a/Content/Blueprints/Managers/BP_Controller.uasset b/Content/Blueprints/Managers/BP_Controller.uasset index de7672c2..88df821b 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_GameInstance.uasset b/Content/Blueprints/Managers/BP_GameInstance.uasset index 3643e9e8..03b1e3c3 100644 Binary files a/Content/Blueprints/Managers/BP_GameInstance.uasset and b/Content/Blueprints/Managers/BP_GameInstance.uasset differ diff --git a/Content/Blueprints/Managers/BP_PawnWalking.uasset b/Content/Blueprints/Managers/BP_PawnWalking.uasset index ee9648fa..64bdfc15 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 75b3835b..08c5a800 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/Core/Data/LevelsRC/DT_LevelsRC.uasset b/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset index 137eb25d..513ea443 100644 Binary files a/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset and b/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset differ diff --git a/Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Dinning/SM_Dinning_Carpet.uasset b/Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Dinning/SM_Dinning_Carpet.uasset index c6b4fc1c..bab9dfcb 100644 Binary files a/Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Dinning/SM_Dinning_Carpet.uasset and b/Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Dinning/SM_Dinning_Carpet.uasset differ diff --git a/Content/HUD/Textures/Blocks/Tactics/BlockFlatMenuNotExists_tactics.uasset b/Content/HUD/Textures/Blocks/Tactics/BlockFlatMenuNotExists_tactics.uasset index 359fb213..7f1d5487 100644 Binary files a/Content/HUD/Textures/Blocks/Tactics/BlockFlatMenuNotExists_tactics.uasset and b/Content/HUD/Textures/Blocks/Tactics/BlockFlatMenuNotExists_tactics.uasset differ diff --git a/Content/HUD/Widgets/UW_FlatCardVR.uasset b/Content/HUD/Widgets/UW_FlatCardVR.uasset index f69a5884..547bb506 100644 Binary files a/Content/HUD/Widgets/UW_FlatCardVR.uasset and b/Content/HUD/Widgets/UW_FlatCardVR.uasset differ diff --git a/Content/HUD/Widgets/UW_LoginGeneral.uasset b/Content/HUD/Widgets/UW_LoginGeneral.uasset index c965d589..e0c17983 100644 Binary files a/Content/HUD/Widgets/UW_LoginGeneral.uasset and b/Content/HUD/Widgets/UW_LoginGeneral.uasset differ diff --git a/Content/HUD/Widgets/UW_Main.uasset b/Content/HUD/Widgets/UW_Main.uasset index 590dccc9..74e17e5d 100644 Binary files a/Content/HUD/Widgets/UW_Main.uasset and b/Content/HUD/Widgets/UW_Main.uasset differ diff --git a/Content/HUD/Widgets/UW_MainVR.uasset b/Content/HUD/Widgets/UW_MainVR.uasset index c2507b63..50a12324 100644 Binary files a/Content/HUD/Widgets/UW_MainVR.uasset and b/Content/HUD/Widgets/UW_MainVR.uasset differ diff --git a/Content/HUD/Widgets/UW_MenuFlat.uasset b/Content/HUD/Widgets/UW_MenuFlat.uasset index ce428ac9..0ba1a5d7 100644 Binary files a/Content/HUD/Widgets/UW_MenuFlat.uasset and b/Content/HUD/Widgets/UW_MenuFlat.uasset differ diff --git a/Content/Maps/L_DeveloperTactics.umap b/Content/Maps/L_DeveloperTactics.umap index f57353cc..bb5393ce 100644 Binary files a/Content/Maps/L_DeveloperTactics.umap and b/Content/Maps/L_DeveloperTactics.umap differ diff --git a/Content/Otrada/Materials/Mi_Water_taktika.uasset b/Content/Otrada/Materials/Mi_Water_taktika.uasset index 1424b827..242907a6 100644 Binary files a/Content/Otrada/Materials/Mi_Water_taktika.uasset and b/Content/Otrada/Materials/Mi_Water_taktika.uasset differ diff --git a/Content/Otrada/Meshes/Otrada/Prom_n_Com/Vsyakoye/Car_Workshop/atlas.uasset b/Content/Otrada/Meshes/Otrada/Prom_n_Com/Vsyakoye/Car_Workshop/atlas.uasset index 95634b83..85620fae 100644 Binary files a/Content/Otrada/Meshes/Otrada/Prom_n_Com/Vsyakoye/Car_Workshop/atlas.uasset and b/Content/Otrada/Meshes/Otrada/Prom_n_Com/Vsyakoye/Car_Workshop/atlas.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Instances/MI_MasterTile2_12.uasset b/Content/Taktika/Assets/Exterior/Instances/MI_MasterTile2_12.uasset index e1780085..86c3d9c9 100644 Binary files a/Content/Taktika/Assets/Exterior/Instances/MI_MasterTile2_12.uasset and b/Content/Taktika/Assets/Exterior/Instances/MI_MasterTile2_12.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Instances/M_Outside_Low_Inst.uasset b/Content/Taktika/Assets/Exterior/Instances/M_Outside_Low_Inst.uasset index d6e7161d..2ae021f0 100644 Binary files a/Content/Taktika/Assets/Exterior/Instances/M_Outside_Low_Inst.uasset and b/Content/Taktika/Assets/Exterior/Instances/M_Outside_Low_Inst.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Instances/NewMaterial1_Inst1.uasset b/Content/Taktika/Assets/Exterior/Instances/NewMaterial1_Inst1.uasset index 5cf60a32..692e01c0 100644 Binary files a/Content/Taktika/Assets/Exterior/Instances/NewMaterial1_Inst1.uasset and b/Content/Taktika/Assets/Exterior/Instances/NewMaterial1_Inst1.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 index 700ff677..82c2ea1d 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset 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 index 68e4b688..134f9443 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_2.uasset and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_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 index 8dd88294..1bcb3076 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_1.uasset 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 index 81cf2133..b74a18e1 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_2.uasset 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_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset index 16a6f8bd..db274cff 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_3.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_3.uasset index 8643c1be..e0a03e76 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_3.uasset and b/Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_3.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph.uasset b/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph.uasset index 3d8675a2..78bbdd19 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph.uasset and b/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph5.uasset b/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph5.uasset index e989dfe8..ec5f4575 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph5.uasset and b/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph5.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph6.uasset b/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph6.uasset index 4bf88d5d..e48f581e 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph6.uasset and b/Content/Taktika/Assets/Exterior/Materials/MI_Atlas_WindowDoor_NonAlph6.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/M_Atlas_WindowDoor_2.uasset b/Content/Taktika/Assets/Exterior/Materials/M_Atlas_WindowDoor_2.uasset index b6586334..50ffc076 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/M_Atlas_WindowDoor_2.uasset and b/Content/Taktika/Assets/Exterior/Materials/M_Atlas_WindowDoor_2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/M_MasterTile2.uasset b/Content/Taktika/Assets/Exterior/Materials/M_MasterTile2.uasset index 731f6805..daf1ef11 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/M_MasterTile2.uasset and b/Content/Taktika/Assets/Exterior/Materials/M_MasterTile2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/M_MasterTile3.uasset b/Content/Taktika/Assets/Exterior/Materials/M_MasterTile3.uasset index a4479e60..815506f3 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/M_MasterTile3.uasset and b/Content/Taktika/Assets/Exterior/Materials/M_MasterTile3.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/M_MasterTile_10.uasset b/Content/Taktika/Assets/Exterior/Materials/M_MasterTile_10.uasset index b955a8be..7198ccb1 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/M_MasterTile_10.uasset and b/Content/Taktika/Assets/Exterior/Materials/M_MasterTile_10.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/M_Outside_Low.uasset b/Content/Taktika/Assets/Exterior/Materials/M_Outside_Low.uasset index 182bcbd0..1e7c6dee 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/M_Outside_Low.uasset and b/Content/Taktika/Assets/Exterior/Materials/M_Outside_Low.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/M_window_b.uasset b/Content/Taktika/Assets/Exterior/Materials/M_window_b.uasset index acc76370..d4cc291e 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/M_window_b.uasset and b/Content/Taktika/Assets/Exterior/Materials/M_window_b.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Materials/NewMaterial1.uasset b/Content/Taktika/Assets/Exterior/Materials/NewMaterial1.uasset index 95af476f..feef8137 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/NewMaterial1.uasset and b/Content/Taktika/Assets/Exterior/Materials/NewMaterial1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_1P_S3_H1_v2.uasset b/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_1P_S3_H1_v2.uasset index b032a3f4..0f9d9cd2 100644 Binary files a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_1P_S3_H1_v2.uasset and b/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_1P_S3_H1_v2.uasset differ diff --git a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_EnvironmentBuild_5_4.uasset b/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_EnvironmentBuild_5_4.uasset index 608498a9..811231fc 100644 Binary files a/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_EnvironmentBuild_5_4.uasset and b/Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/2/SM_EnvironmentBuild_5_4.uasset 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 index a5fa2b55..cc167704 100644 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SM_InnerYard_1.uasset and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_InnerYard_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard.uasset index 7ebfb998..4c42052b 100644 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard.uasset and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard.uasset differ diff --git a/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_061.uasset b/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_061.uasset index 0d38dbeb..739ca3cd 100644 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_061.uasset and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_061.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 index c6351182..bc2877ec 100644 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof1.uasset 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 index cdb4a914..743d33a6 100644 Binary files a/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof2.uasset and b/Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof2.uasset differ diff --git a/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F03.uasset b/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F03.uasset new file mode 100644 index 00000000..11b8b69a Binary files /dev/null and b/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F03.uasset differ diff --git a/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F04.uasset b/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F04.uasset new file mode 100644 index 00000000..f6122991 Binary files /dev/null and b/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F04.uasset differ diff --git a/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F05.uasset b/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F05.uasset new file mode 100644 index 00000000..03238478 Binary files /dev/null and b/Content/Taktika/Assets/Interior/SM_TKT_ApCaps_S01F05.uasset differ diff --git a/Content/Taktika/Assets/Interior/WallsCaps/S01F03_WallsCaps.uasset b/Content/Taktika/Assets/Interior/WallsCaps/S01F03_WallsCaps.uasset index 09174067..6033a76b 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 d04c0d78..20fcdb3e 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 9ba5822c..35323a29 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 b9833de5..152e4157 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 c4b71c05..0da0ce72 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 dd700cc8..bed25181 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_002.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_DoorMOP_002.uasset index aadb47bf..f2703754 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_DoorMOP_002.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_DoorMOP_002.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorL_90_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorL_90_001.uasset index b0c1df9b..328bc696 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorL_90_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorL_90_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_80_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_80_001.uasset index 4c25fdd9..d870f753 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_80_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_80_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_90_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_90_001.uasset index 08a7d439..1c707b9a 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_90_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_BalconDoorR_90_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_Windows_P3_237_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_Windows_P3_237_001.uasset deleted file mode 100644 index 0f5a5f32..00000000 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_Windows_P3_237_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_Windows_P5_445_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_Windows_P5_445_001.uasset index 0edc088a..c36d7f05 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_Windows_P5_445_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F03_Windows_P5_445_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F04_Windows_P5_445_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F04_Windows_P5_445_001.uasset index c558e2d4..97ff28e8 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F04_Windows_P5_445_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F04_Windows_P5_445_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P1_120_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P1_120_001.uasset index 3a981471..2b8c96e8 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P1_120_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P1_120_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_180_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_180_001.uasset index 77b69bec..1bd8584a 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_180_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_180_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_210_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_210_001.uasset index 3d488b02..36a5be30 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_210_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P2_210_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_237_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_237_001.uasset deleted file mode 100644 index e0280cfb..00000000 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_237_001.uasset and /dev/null differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_257_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_257_001.uasset index 675cd38a..d2dce0e7 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_257_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_257_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_Panoramic_257_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_Panoramic_257_001.uasset index 40d27dd6..4f6dc69e 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_Panoramic_257_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P3_Panoramic_257_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_400_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_400_001.uasset index 9c21daf1..05ec05ac 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_400_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_400_001.uasset differ diff --git a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_445_001.uasset b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_445_001.uasset index 55b68d83..99e5b553 100644 Binary files a/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_445_001.uasset and b/Content/Taktika/Assets/Interior/WindowsDoors/SM_Windows_P5_Panoramic_445_001.uasset differ diff --git a/Content/Taktika/BP/Light_4Bake.uasset b/Content/Taktika/BP/Light_4Bake.uasset index f994fadc..ef68d27f 100644 Binary files a/Content/Taktika/BP/Light_4Bake.uasset and b/Content/Taktika/BP/Light_4Bake.uasset differ diff --git a/Content/Taktika/BP/Light_4Border.uasset b/Content/Taktika/BP/Light_4Border.uasset new file mode 100644 index 00000000..0d3d5e84 Binary files /dev/null and b/Content/Taktika/BP/Light_4Border.uasset differ diff --git a/Content/Taktika/BP/MI_Cap_Default.uasset b/Content/Taktika/BP/MI_Cap_Default.uasset new file mode 100644 index 00000000..f299324a Binary files /dev/null and b/Content/Taktika/BP/MI_Cap_Default.uasset differ diff --git a/Content/Taktika/BP/MI_Cap_SPECIAL.uasset b/Content/Taktika/BP/MI_Cap_SPECIAL.uasset new file mode 100644 index 00000000..41e91955 Binary files /dev/null and b/Content/Taktika/BP/MI_Cap_SPECIAL.uasset differ diff --git a/Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap b/Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap index 3cf34765..fd5b3f9c 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 1fed952f..b09dc227 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_S01F03_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap index 1b5c9c3f..89265a5b 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_Reflections.umap b/Content/Taktika/Maps/Interior/TKT_S01F03_Reflections.umap index 2bb082f6..5618b8bc 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F03_Reflections.umap and b/Content/Taktika/Maps/Interior/TKT_S01F03_Reflections.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F04_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S01F04_Interior.umap index e85eb34a..fa993141 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_Reflections.umap b/Content/Taktika/Maps/Interior/TKT_S01F04_Reflections.umap index 4496ffe1..c11f68d7 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F04_Reflections.umap and b/Content/Taktika/Maps/Interior/TKT_S01F04_Reflections.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap b/Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap index 811b8f71..f6f1b81d 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap and b/Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap differ diff --git a/Content/Taktika/Maps/Interior/TKT_S01F05_Reflections.umap b/Content/Taktika/Maps/Interior/TKT_S01F05_Reflections.umap index e8ccc794..2b1705e9 100644 Binary files a/Content/Taktika/Maps/Interior/TKT_S01F05_Reflections.umap and b/Content/Taktika/Maps/Interior/TKT_S01F05_Reflections.umap differ diff --git a/Content/Taktika/Maps/TKT_Cars.umap b/Content/Taktika/Maps/TKT_Cars.umap index ea344f7b..23e4942f 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 028e4366..f0c8380f 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 cd7166ad..16de1cfa 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 3fb06ae5..4a674a98 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_MainScene.umap b/Content/Taktika/Maps/TKT_MainScene.umap index 5a9bdd64..b64a8e3e 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 704fb417..c59447c0 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 a290465e..c1c4115f 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 index 37153cb8..48c83e73 100644 Binary files a/Content/Taktika/Maps/TKT_Roads_Bake.umap and b/Content/Taktika/Maps/TKT_Roads_Bake.umap differ diff --git a/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp b/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp index 324cf0f4..f940629c 100644 --- a/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp +++ b/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp @@ -24,20 +24,20 @@ void AResComLevelPackLoader::Tick(float DeltaTime) { Super::Tick(DeltaTime); - if (packLoading->IsLoaded()) + /*if (packLoading->IsLoaded()) { Destroy(); - } + }*/ } -void AResComLevelPackLoader::LoadPack(FFloorPack* pack) -{ - FLatentActionInfo latentInfo; - latentInfo.CallbackTarget = this; - latentInfo.UUID = 0; - latentInfo.Linkage = 0; +//void AResComLevelPackLoader::LoadPack(FFloorPack* pack) +//{ +// FLatentActionInfo latentInfo; +// latentInfo.CallbackTarget = this; +// latentInfo.UUID = 0; +// latentInfo.Linkage = 0; - latentInfo.ExecutionFunction = "OnLevelPreview"; + /*latentInfo.ExecutionFunction = "OnLevelPreview"; for (auto& level : pack.levelsPreview) { ++queueElem.visibleCnt; @@ -60,5 +60,5 @@ void AResComLevelPackLoader::LoadPack(FFloorPack* pack) ++latentInfo.UUID; UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); } - return true; -} \ No newline at end of file + return true;*/ +//} \ No newline at end of file diff --git a/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h b/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h index c88fc492..945b700c 100644 --- a/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h +++ b/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h @@ -2,7 +2,7 @@ #pragma once -#include "ResComFloorManager.h" +//#include "ResComFloorManager.h" #include "CoreMinimal.h" #include "GameFramework/Actor.h" #include "ResComLevelPackLoader.generated.h" @@ -12,11 +12,11 @@ class FORTIS_TAKTIKA_API AResComLevelPackLoader : public AActor { GENERATED_BODY() private: - FFloorPack* packLoading; + //FFloorPack* packLoading; public: // Sets default values for this actor's properties AResComLevelPackLoader(); - AResComLevelPackLoader(FFloorPack* pack) : packLoading(pack){} + //AResComLevelPackLoader(FFloorPack* pack) : packLoading(pack){} protected: // Called when the game starts or when spawned @@ -25,6 +25,6 @@ protected: public: // Called every frame virtual void Tick(float DeltaTime) override; - void LoadPack(FFloorPack* pack); + //void LoadPack(FFloorPack* pack); };