diff --git a/Content/Blueprints/Environment/BP_Elevator.uasset b/Content/Blueprints/Environment/BP_Elevator.uasset index f864091e..54ae3f07 100644 Binary files a/Content/Blueprints/Environment/BP_Elevator.uasset and b/Content/Blueprints/Environment/BP_Elevator.uasset differ diff --git a/Content/Blueprints/Managers/BP_Controller.uasset b/Content/Blueprints/Managers/BP_Controller.uasset index e7b9c137..6ad25638 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_PawnWalking.uasset b/Content/Blueprints/Managers/BP_PawnWalking.uasset index 1c3b24c3..d513c383 100644 Binary files a/Content/Blueprints/Managers/BP_PawnWalking.uasset and b/Content/Blueprints/Managers/BP_PawnWalking.uasset differ diff --git a/Content/Blueprints/Player/BP_PlayerStateManager.uasset b/Content/Blueprints/Player/BP_PlayerStateManager.uasset index 84427ad9..37eadeea 100644 Binary files a/Content/Blueprints/Player/BP_PlayerStateManager.uasset and b/Content/Blueprints/Player/BP_PlayerStateManager.uasset differ diff --git a/Content/Blueprints/Points/BP_ApartBorderManager.uasset b/Content/Blueprints/Points/BP_ApartBorderManager.uasset new file mode 100644 index 00000000..11028ae6 Binary files /dev/null and b/Content/Blueprints/Points/BP_ApartBorderManager.uasset differ diff --git a/Content/Blueprints/Points/BP_ApartmentsBorderManager.uasset b/Content/Blueprints/Points/BP_ApartmentsBorderManager.uasset new file mode 100644 index 00000000..28924334 Binary files /dev/null and b/Content/Blueprints/Points/BP_ApartmentsBorderManager.uasset differ diff --git a/Content/Blueprints/Points/BP_Point.uasset b/Content/Blueprints/Points/BP_Point.uasset index 1ef4b688..1df169cf 100644 Binary files a/Content/Blueprints/Points/BP_Point.uasset and b/Content/Blueprints/Points/BP_Point.uasset differ diff --git a/Content/Freestyle/Maps/Freestyle_Developer.umap b/Content/Freestyle/Maps/Freestyle_Developer.umap index 5f75d1fd..f610547e 100644 Binary files a/Content/Freestyle/Maps/Freestyle_Developer.umap and b/Content/Freestyle/Maps/Freestyle_Developer.umap differ diff --git a/Content/Furniture/All/Materials/Inst/Metal/MI_PaintMetal_Dark.uasset b/Content/Furniture/All/Materials/Inst/Metal/MI_PaintMetal_Dark.uasset index 32471352..6fadda9c 100644 Binary files a/Content/Furniture/All/Materials/Inst/Metal/MI_PaintMetal_Dark.uasset and b/Content/Furniture/All/Materials/Inst/Metal/MI_PaintMetal_Dark.uasset differ diff --git a/Content/HUD/Blueprints/BP_UIStateManager.uasset b/Content/HUD/Blueprints/BP_UIStateManager.uasset index da18f9a4..9a120c59 100644 Binary files a/Content/HUD/Blueprints/BP_UIStateManager.uasset and b/Content/HUD/Blueprints/BP_UIStateManager.uasset differ diff --git a/Content/HUD/Widgets/UW_Main.uasset b/Content/HUD/Widgets/UW_Main.uasset index 44cdbdd3..f5171803 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_NavigationButtons.uasset b/Content/HUD/Widgets/UW_NavigationButtons.uasset index c716dbbd..ffa15f71 100644 Binary files a/Content/HUD/Widgets/UW_NavigationButtons.uasset and b/Content/HUD/Widgets/UW_NavigationButtons.uasset differ diff --git a/Content/HUD/Widgets/UW_Overview.uasset b/Content/HUD/Widgets/UW_Overview.uasset index c7a67113..68ea4ab6 100644 Binary files a/Content/HUD/Widgets/UW_Overview.uasset and b/Content/HUD/Widgets/UW_Overview.uasset differ diff --git a/Content/Maps/L_Test.umap b/Content/Maps/L_Test.umap index 69ba808f..1b70d639 100644 Binary files a/Content/Maps/L_Test.umap and b/Content/Maps/L_Test.umap differ diff --git a/Content/Otrada/Maps/Interior_Levels/A_11/A11_F1_ReflectionsTest.umap b/Content/Otrada/Maps/Interior_Levels/A_11/A11_F1_ReflectionsTest.umap new file mode 100644 index 00000000..18da33f9 Binary files /dev/null and b/Content/Otrada/Maps/Interior_Levels/A_11/A11_F1_ReflectionsTest.umap differ diff --git a/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/M_TestEmissive.uasset b/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/M_TestEmissive.uasset new file mode 100644 index 00000000..001ce60f Binary files /dev/null and b/Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/M_TestEmissive.uasset differ diff --git a/Source/FORTIS_Taktika/Private/ResComPlayerController.cpp b/Source/FORTIS_Taktika/Private/ResComPlayerController.cpp index 233f88d1..a80ce617 100644 --- a/Source/FORTIS_Taktika/Private/ResComPlayerController.cpp +++ b/Source/FORTIS_Taktika/Private/ResComPlayerController.cpp @@ -23,28 +23,34 @@ AResComFloorManager* AResComPlayerController::GetFloorManager() const return floorManager; } -void AResComPoint::BeginPlay() +//void AResComPoint::BeginPlay() +//{ +// Super::BeginPlay(); +// +// // spectrator window +// /*SlateWin = SNew(SWindow) +// .AutoCenter(EAutoCenter::None) +// .Title(FText::FromString(TEXT("Control Window"))) +// .IsInitiallyMaximized(false) +// .ScreenPosition(FVector2D(0, 0)) +// .ClientSize(FVector2D(500, 800)) +// .CreateTitleBar(true) +// .SizingRule(ESizingRule::UserSized) +// .SupportsMaximize(false) +// .SupportsMinimize(true) +// .HasCloseButton(true); +// +// TSharedRef SlateWinRef = SlateWin.ToSharedRef(); +// +// FSlateApplication& SlateApp = FSlateApplication::Get(); +// +// SlateApp.AddWindow(SlateWinRef, true); +// +// SlateWinRef->SetContent(SNew(SControlWidget));*/ +//} + +void AResComPlayerController::freeMemory() { - Super::BeginPlay(); - - // spectrator window - /*SlateWin = SNew(SWindow) - .AutoCenter(EAutoCenter::None) - .Title(FText::FromString(TEXT("Control Window"))) - .IsInitiallyMaximized(false) - .ScreenPosition(FVector2D(0, 0)) - .ClientSize(FVector2D(500, 800)) - .CreateTitleBar(true) - .SizingRule(ESizingRule::UserSized) - .SupportsMaximize(false) - .SupportsMinimize(true) - .HasCloseButton(true); - - TSharedRef SlateWinRef = SlateWin.ToSharedRef(); - - FSlateApplication& SlateApp = FSlateApplication::Get(); - - SlateApp.AddWindow(SlateWinRef, true); - - SlateWinRef->SetContent(SNew(SControlWidget));*/ + GEngine->ForceGarbageCollection(); + //GetWorld()->ForceGarbageCollection(true); } \ No newline at end of file diff --git a/Source/FORTIS_Taktika/Public/ResComPlayerController.h b/Source/FORTIS_Taktika/Public/ResComPlayerController.h index 9cbef752..ed478876 100644 --- a/Source/FORTIS_Taktika/Public/ResComPlayerController.h +++ b/Source/FORTIS_Taktika/Public/ResComPlayerController.h @@ -25,11 +25,14 @@ protected: UFUNCTION(BlueprintCallable, Category = "FloorManager") void SetFloorManager(AResComFloorManager* manager); - virtual void BeginPlay() override; + //virtual void BeginPlay() override; public: UFUNCTION(BlueprintCallable, Category = "PlayerManager") AResComPlayerStateManager* GetPlayerStateManager() const; UFUNCTION(BlueprintCallable, Category = "FloorManager") AResComFloorManager* GetFloorManager() const; + + UFUNCTION(BlueprintCallable, Category = "GarbageCollection") + void freeMemory(); };