diff --git a/Content/Characters/(Shared)/Effects/GE_Cost_Stamina.uasset b/Content/Characters/(Shared)/Effects/GE_Cost_Stamina.uasset index 5a37d3d..ef1436e 100644 Binary files a/Content/Characters/(Shared)/Effects/GE_Cost_Stamina.uasset and b/Content/Characters/(Shared)/Effects/GE_Cost_Stamina.uasset differ diff --git a/Content/Characters/Hero1/Abilities/Blast/T_Hero1_Blast.uasset b/Content/Characters/Hero1/Abilities/Blast/T_Hero1_Blast.uasset index eea2636..cd9ece7 100644 Binary files a/Content/Characters/Hero1/Abilities/Blast/T_Hero1_Blast.uasset and b/Content/Characters/Hero1/Abilities/Blast/T_Hero1_Blast.uasset differ diff --git a/Content/Characters/Hero1/Abilities/Jump/GA_Hero1_Jump.uasset b/Content/Characters/Hero1/Abilities/Jump/GA_Hero1_Jump.uasset index 40fe665..bd0a4f9 100644 Binary files a/Content/Characters/Hero1/Abilities/Jump/GA_Hero1_Jump.uasset and b/Content/Characters/Hero1/Abilities/Jump/GA_Hero1_Jump.uasset differ diff --git a/Content/Characters/Hero1/Abilities/Jump/T_Hero1_Jump.uasset b/Content/Characters/Hero1/Abilities/Jump/T_Hero1_Jump.uasset index ce35a43..3998082 100644 Binary files a/Content/Characters/Hero1/Abilities/Jump/T_Hero1_Jump.uasset and b/Content/Characters/Hero1/Abilities/Jump/T_Hero1_Jump.uasset differ diff --git a/Content/Characters/Hero1/Abilities/Poison/T_Hero1_Poison.uasset b/Content/Characters/Hero1/Abilities/Poison/T_Hero1_Poison.uasset index 5b632a3..991a944 100644 Binary files a/Content/Characters/Hero1/Abilities/Poison/T_Hero1_Poison.uasset and b/Content/Characters/Hero1/Abilities/Poison/T_Hero1_Poison.uasset differ diff --git a/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset b/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset index 66e515f..4e94d6f 100644 Binary files a/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset and b/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset differ diff --git a/Content/Characters/Hero1/Abilities/Shield/T_Hero1_Shield.uasset b/Content/Characters/Hero1/Abilities/Shield/T_Hero1_Shield.uasset index 545bbb0..9ca54c4 100644 Binary files a/Content/Characters/Hero1/Abilities/Shield/T_Hero1_Shield.uasset and b/Content/Characters/Hero1/Abilities/Shield/T_Hero1_Shield.uasset differ diff --git a/Content/Core/Debug/Cheats/GA_Debug.uasset b/Content/Core/Debug/Cheats/GA_Cheat_Debug.uasset similarity index 54% rename from Content/Core/Debug/Cheats/GA_Debug.uasset rename to Content/Core/Debug/Cheats/GA_Cheat_Debug.uasset index 4119026..31552a4 100644 Binary files a/Content/Core/Debug/Cheats/GA_Debug.uasset and b/Content/Core/Debug/Cheats/GA_Cheat_Debug.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat.uasset b/Content/Core/Debug/Cheats/GE_Cheat.uasset new file mode 100644 index 0000000..b604b1e Binary files /dev/null and b/Content/Core/Debug/Cheats/GE_Cheat.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Cooldown.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Cooldown.uasset index def697d..7cc39db 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Cooldown.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Cooldown.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Cost.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Cost.uasset index 01e8b92..e1a1aed 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Cost.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Cost.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Damage.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Damage.uasset index 312e462..3409920 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Damage.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Damage.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Ghost.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Ghost.uasset index a8ba546..ce12278 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Ghost.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Ghost.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_God.uasset b/Content/Core/Debug/Cheats/GE_Cheat_God.uasset index 73710df..761afd4 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_God.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_God.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Heal.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Heal.uasset index e337dbf..974a1ed 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Heal.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Heal.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Immobilize.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Immobilize.uasset index af4f266..c63c317 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Immobilize.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Immobilize.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Kill.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Kill.uasset index 35f792b..f5ce434 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Kill.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Kill.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Revive.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Revive.uasset index 6a18008..c10314b 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Revive.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Revive.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Slow.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Slow.uasset index a3e1186..7fccddd 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Slow.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Slow.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Speed.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Speed.uasset index 6d614e5..a7f6476 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Speed.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Speed.uasset differ diff --git a/Content/Core/Debug/Cheats/GE_Cheat_Stun.uasset b/Content/Core/Debug/Cheats/GE_Cheat_Stun.uasset index 0d12f43..3556221 100644 Binary files a/Content/Core/Debug/Cheats/GE_Cheat_Stun.uasset and b/Content/Core/Debug/Cheats/GE_Cheat_Stun.uasset differ diff --git a/Content/Core/Debug/Cheats/T_Effect_Cheat.uasset b/Content/Core/Debug/Cheats/T_Effect_Cheat.uasset new file mode 100644 index 0000000..199608a Binary files /dev/null and b/Content/Core/Debug/Cheats/T_Effect_Cheat.uasset differ diff --git a/Content/Core/Debug/DA_Debug_Abilities.uasset b/Content/Core/Debug/DA_Debug_Abilities.uasset index d619851..b43d455 100644 Binary files a/Content/Core/Debug/DA_Debug_Abilities.uasset and b/Content/Core/Debug/DA_Debug_Abilities.uasset differ diff --git a/Content/Core/Effects/BP_EffectUIData.uasset b/Content/Core/Effects/BP_EffectUIData.uasset deleted file mode 100644 index 90eb9c9..0000000 Binary files a/Content/Core/Effects/BP_EffectUIData.uasset and /dev/null differ diff --git a/Content/Core/Hud/BP_EffectUIData.uasset b/Content/Core/Hud/BP_EffectUIData.uasset new file mode 100644 index 0000000..63fe2b5 Binary files /dev/null and b/Content/Core/Hud/BP_EffectUIData.uasset differ diff --git a/Content/Core/Hud/WBP_Ability.uasset b/Content/Core/Hud/WBP_Ability.uasset index 33ca9fb..362db29 100644 Binary files a/Content/Core/Hud/WBP_Ability.uasset and b/Content/Core/Hud/WBP_Ability.uasset differ diff --git a/Content/Core/Hud/WBP_Effect.uasset b/Content/Core/Hud/WBP_Effect.uasset index 9077079..e2a95a8 100644 Binary files a/Content/Core/Hud/WBP_Effect.uasset and b/Content/Core/Hud/WBP_Effect.uasset differ diff --git a/Content/Core/Hud/WBP_Hud.uasset b/Content/Core/Hud/WBP_Hud.uasset index 91106c1..bc45b24 100644 Binary files a/Content/Core/Hud/WBP_Hud.uasset and b/Content/Core/Hud/WBP_Hud.uasset differ diff --git a/Content/Core/Hud/WBP_Status.uasset b/Content/Core/Hud/WBP_Status.uasset index b853680..cca6478 100644 Binary files a/Content/Core/Hud/WBP_Status.uasset and b/Content/Core/Hud/WBP_Status.uasset differ diff --git a/Content/Core/Textures/T_EffectDefaultIcon.uasset b/Content/Core/Textures/T_EffectDefaultIcon.uasset new file mode 100644 index 0000000..97609b1 Binary files /dev/null and b/Content/Core/Textures/T_EffectDefaultIcon.uasset differ diff --git a/Plugins/CogWindow/Source/CogWindow/Private/CogWindow.cpp b/Plugins/CogWindow/Source/CogWindow/Private/CogWindow.cpp index 3f383ce..4c03f46 100644 --- a/Plugins/CogWindow/Source/CogWindow/Private/CogWindow.cpp +++ b/Plugins/CogWindow/Source/CogWindow/Private/CogWindow.cpp @@ -80,6 +80,8 @@ void UCogWindow::Render(float DeltaTime) RenderContent(); ImGui::End(); } + + PostRender(); } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/CogWindow/Source/CogWindow/Private/CogWindowManager.cpp b/Plugins/CogWindow/Source/CogWindow/Private/CogWindowManager.cpp index 44f03ee..11ca39a 100644 --- a/Plugins/CogWindow/Source/CogWindow/Private/CogWindowManager.cpp +++ b/Plugins/CogWindow/Source/CogWindow/Private/CogWindowManager.cpp @@ -3,6 +3,7 @@ #include "CogImguiModule.h" #include "CogImguiWidget.h" #include "CogWindowWidgets.h" +#include "CogWindow_Spacing.h" #include "Engine/Engine.h" #include "imgui_internal.h" @@ -27,6 +28,11 @@ void UCogWindowManager::Initialize(UWorld* InWorld, TSharedPtr IniHandler.WriteAllFn = UCogWindowManager::SettingsHandler_WriteAll; IniHandler.UserData = this; ImGui::AddSettingsHandler(&IniHandler); + + SpaceWindows.Add(CreateWindow("Space 1", false)); + SpaceWindows.Add(CreateWindow("Space 2", false)); + SpaceWindows.Add(CreateWindow("Space 3", false)); + SpaceWindows.Add(CreateWindow("Space 4", false)); } //-------------------------------------------------------------------------------------------------------------------------- @@ -66,7 +72,9 @@ void UCogWindowManager::Tick(float DeltaTime) //-------------------------------------------------------------------------------------------------------------------------- void UCogWindowManager::Render(float DeltaTime) { - ImGui::DockSpaceOverViewport(0, ImGuiDockNodeFlags_PassthruCentralNode | ImGuiDockNodeFlags_NoDockingInCentralNode); + ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0)); + ImGui::DockSpaceOverViewport(0, ImGuiDockNodeFlags_PassthruCentralNode | ImGuiDockNodeFlags_NoDockingInCentralNode | ImGuiDockNodeFlags_AutoHideTabBar); + ImGui::PopStyleColor(1); bool bCompactSaved = bCompactMode; if (bCompactSaved) @@ -92,6 +100,8 @@ void UCogWindowManager::Render(float DeltaTime) { ImGui::SetNextWindowBgAlpha(0.35f); } + + ImGui::DockSpaceOverViewport(0, ImGuiDockNodeFlags_PassthruCentralNode | ImGuiDockNodeFlags_NoDockingInCentralNode | ImGuiDockNodeFlags_AutoHideTabBar); Window->Render(DeltaTime); } } @@ -277,6 +287,21 @@ void UCogWindowManager::DrawMainMenu() ImGui::Separator(); + if (ImGui::BeginMenu("Spacing")) + { + for (UCogWindow* SpaceWindow : SpaceWindows) + { + bool bSpaceVisible = SpaceWindow->GetIsVisible(); + if (ImGui::MenuItem(TCHAR_TO_ANSI(*SpaceWindow->GetName()), nullptr, &bSpaceVisible)) + { + SpaceWindow->SetIsVisible(bSpaceVisible); + } + } + ImGui::EndMenu(); + } + + ImGui::Separator(); + ImGui::MenuItem("Compact Mode", nullptr, &bCompactMode); ImGui::Text("DPI Scale"); diff --git a/Plugins/CogWindow/Source/CogWindow/Private/CogWindow_Spacing.cpp b/Plugins/CogWindow/Source/CogWindow/Private/CogWindow_Spacing.cpp new file mode 100644 index 0000000..828b37d --- /dev/null +++ b/Plugins/CogWindow/Source/CogWindow/Private/CogWindow_Spacing.cpp @@ -0,0 +1,13 @@ +#include "CogWindow_Spacing.h" + +//-------------------------------------------------------------------------------------------------------------------------- +void UCogWindow_Spacing::PreRender(ImGuiWindowFlags& WindowFlags) +{ + ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0)); +} + +//-------------------------------------------------------------------------------------------------------------------------- +void UCogWindow_Spacing::PostRender() +{ + ImGui::PopStyleColor(1); +} diff --git a/Plugins/CogWindow/Source/CogWindow/Public/CogWindow.h b/Plugins/CogWindow/Source/CogWindow/Public/CogWindow.h index 31956e5..13746d9 100644 --- a/Plugins/CogWindow/Source/CogWindow/Public/CogWindow.h +++ b/Plugins/CogWindow/Source/CogWindow/Public/CogWindow.h @@ -63,6 +63,8 @@ protected: virtual void PreRender(ImGuiWindowFlags& WindowFlags) {} + virtual void PostRender() {} + virtual void RenderContent() {} virtual bool CheckEditorVisibility(); diff --git a/Plugins/CogWindow/Source/CogWindow/Public/CogWindowManager.h b/Plugins/CogWindow/Source/CogWindow/Public/CogWindowManager.h index f4a89ca..71fa965 100644 --- a/Plugins/CogWindow/Source/CogWindow/Public/CogWindowManager.h +++ b/Plugins/CogWindow/Source/CogWindow/Public/CogWindowManager.h @@ -89,6 +89,9 @@ private: UPROPERTY() TArray Windows; + UPROPERTY() + TArray SpaceWindows; + UPROPERTY() TArray MainMenuWidgets; diff --git a/Plugins/CogWindow/Source/CogWindow/Public/CogWindow_Spacing.h b/Plugins/CogWindow/Source/CogWindow/Public/CogWindow_Spacing.h new file mode 100644 index 0000000..9b924e3 --- /dev/null +++ b/Plugins/CogWindow/Source/CogWindow/Public/CogWindow_Spacing.h @@ -0,0 +1,22 @@ +#pragma once + +#include "CoreMinimal.h" +#include "CogWindow.h" +#include "CogWindow_Spacing.generated.h" + +UCLASS() +class COGWINDOW_API UCogWindow_Spacing : public UCogWindow +{ + GENERATED_BODY() + +public: + +protected: + + virtual void PreRender(ImGuiWindowFlags& WindowFlags) override; + + virtual void PostRender() override; + +private: + +}; diff --git a/RawAssets/T_EffectDefaultIcon.afphoto b/RawAssets/T_EffectDefaultIcon.afphoto new file mode 100644 index 0000000..0b046fc Binary files /dev/null and b/RawAssets/T_EffectDefaultIcon.afphoto differ diff --git a/RawAssets/T_EffectDefaultIcon.png b/RawAssets/T_EffectDefaultIcon.png new file mode 100644 index 0000000..5afae77 Binary files /dev/null and b/RawAssets/T_EffectDefaultIcon.png differ diff --git a/RawAssets/T_Effect_Cheat.afphoto b/RawAssets/T_Effect_Cheat.afphoto new file mode 100644 index 0000000..74014c4 Binary files /dev/null and b/RawAssets/T_Effect_Cheat.afphoto differ diff --git a/RawAssets/T_Effect_Cheat.png b/RawAssets/T_Effect_Cheat.png new file mode 100644 index 0000000..9963777 Binary files /dev/null and b/RawAssets/T_Effect_Cheat.png differ diff --git a/RawAssets/T_Hero1_Blast.PNG b/RawAssets/T_Hero1_Blast.PNG index 22fff8f..e3c2376 100644 Binary files a/RawAssets/T_Hero1_Blast.PNG and b/RawAssets/T_Hero1_Blast.PNG differ diff --git a/RawAssets/T_Hero1_Blast.afphoto b/RawAssets/T_Hero1_Blast.afphoto index 7a5ffe1..e9879e2 100644 Binary files a/RawAssets/T_Hero1_Blast.afphoto and b/RawAssets/T_Hero1_Blast.afphoto differ diff --git a/RawAssets/T_Hero1_Jump.PNG b/RawAssets/T_Hero1_Jump.PNG index 509e270..d26462c 100644 Binary files a/RawAssets/T_Hero1_Jump.PNG and b/RawAssets/T_Hero1_Jump.PNG differ diff --git a/RawAssets/T_Hero1_Jump.afphoto b/RawAssets/T_Hero1_Jump.afphoto index 6de81e6..b995af8 100644 Binary files a/RawAssets/T_Hero1_Jump.afphoto and b/RawAssets/T_Hero1_Jump.afphoto differ diff --git a/RawAssets/T_Hero1_Poison.PNG b/RawAssets/T_Hero1_Poison.PNG index 331b055..785980d 100644 Binary files a/RawAssets/T_Hero1_Poison.PNG and b/RawAssets/T_Hero1_Poison.PNG differ diff --git a/RawAssets/T_Hero1_Poison.afphoto b/RawAssets/T_Hero1_Poison.afphoto index 568d395..0e0ae95 100644 Binary files a/RawAssets/T_Hero1_Poison.afphoto and b/RawAssets/T_Hero1_Poison.afphoto differ diff --git a/RawAssets/T_Hero1_Shield.PNG b/RawAssets/T_Hero1_Shield.PNG index 451fe3d..41eef03 100644 Binary files a/RawAssets/T_Hero1_Shield.PNG and b/RawAssets/T_Hero1_Shield.PNG differ diff --git a/RawAssets/T_Hero1_Shield.afphoto b/RawAssets/T_Hero1_Shield.afphoto index 7dbe82a..265ba1b 100644 Binary files a/RawAssets/T_Hero1_Shield.afphoto and b/RawAssets/T_Hero1_Shield.afphoto differ