ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-08-05 23:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'arnaud-jamin/main'

Browse Source 
# Conflicts:
#	Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h
This commit is contained in:
ed
2024-10-08 17:38:02 -04:00
parent eb543ffdd8 3539881135
commit 66caf73df9
59 changed files with 1367 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/CogInput/Source/CogInput/CogInput.Build.cs
+1
View File
@@ -22,6 +22,7 @@ public class CogInput : ModuleRules
new string[]
{
"Core",
"CogCommon",
"CogImgui",
"CogDebug",
"CogWindow",
Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h
+2 -2
View File
@@ -1,9 +1,9 @@
#pragma once
#include "CoreMinimal.h"
#include "CogCommonConfig.h"
#include "CogInjectActionInfo.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "CogInputWindow_Actions.generated.h"
class UInputAction;
@@ -44,7 +44,7 @@ private:
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogInputConfig_Actions : public UCogWindowConfig
class UCogInputConfig_Actions : public UCogCommonConfig
{
GENERATED_BODY()
Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h
+2 -2
View File
@@ -1,9 +1,9 @@
#pragma once
#include "CoreMinimal.h"
#include "CogCommonConfig.h"
#include "CogInjectActionInfo.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "imgui.h"
#include "InputCoreTypes.h"
#include "CogInputWindow_Gamepad.generated.h"
@@ -66,7 +66,7 @@ protected:
//--------------------------------------------------------------------------------------------------------------------------
UCLASS(Config = Cog)
class UCogInputConfig_Gamepad : public UCogWindowConfig
class UCogInputConfig_Gamepad : public UCogCommonConfig
{
GENERATED_BODY()