Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis

# Conflicts:
#	Content/Taktika/Maps/Interior/TKT_S01F03_Interior.umap
#	Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap

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)

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;
-}
+	return true;*/
+//}