From 74d43f0b4c307405cc5f17e195ca50164a280da1 Mon Sep 17 00:00:00 2001 From: Eduardo Valencia Date: Wed, 18 Oct 2023 16:51:12 -0400 Subject: [PATCH] Update gitignore for Rider, fix typos I use Rider as my IDE and when working with Unreal projects it installs a plugin that enable its unique integration. We don't want that being uploaded to the repo so it gets ignored. In addition, The project module has a typo, this commit fixes that --- .gitignore | 6 +++++ Cog.uproject | 28 ++++++++++----------- Source/CogSample/CogSampleLogCategories.cpp | 2 +- Source/CogSample/CogSampleLogCategories.h | 3 ++- Source/CogSample/CogSampleModule.cpp | 2 +- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 9ebf896..72a6c57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ # Visual Studio 2015 user specific files .vs/ +# Rider user specific files +.idea/ + +# Rider UnrealLink plugin, as the IDE will install and update itself +Plugins/Developer/RiderLink/ + # Compiled Object files *.slo *.lo diff --git a/Cog.uproject b/Cog.uproject index e4b34c3..201dbcf 100644 --- a/Cog.uproject +++ b/Cog.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.1", + "EngineAssociation": "{3A102A73-4E1B-A4EE-9D23-BC868A1B3015}", "Category": "", "Description": "", "Modules": [ @@ -10,17 +10,17 @@ "LoadingPhase": "Default" } ], - "Plugins": [ - { - "Name": "GameplayAbilities", - "Enabled": true - }, - { - "Name": "ModelingToolsEditorMode", - "Enabled": true, - "TargetAllowList": [ - "Editor" - ] - } - ] + "Plugins": [ + { + "Name": "GameplayAbilities", + "Enabled": true + }, + { + "Name": "ModelingToolsEditorMode", + "Enabled": true, + "TargetAllowList": [ + "Editor" + ] + } + ] } \ No newline at end of file diff --git a/Source/CogSample/CogSampleLogCategories.cpp b/Source/CogSample/CogSampleLogCategories.cpp index d145e47..6e3b5b9 100644 --- a/Source/CogSample/CogSampleLogCategories.cpp +++ b/Source/CogSample/CogSampleLogCategories.cpp @@ -23,7 +23,7 @@ DEFINE_LOG_CATEGORY(LogCogTargetAcquisition); namespace CogSampleLog { - void RegiterAllLogCategories() + void RegisterAllLogCategories() { #if ENABLE_COG FCogDebugLog::AddLogCategory(LogCogAlways, "Always", "Debug Category that is always active", false); diff --git a/Source/CogSample/CogSampleLogCategories.h b/Source/CogSample/CogSampleLogCategories.h index 1c568e7..8e824a0 100644 --- a/Source/CogSample/CogSampleLogCategories.h +++ b/Source/CogSample/CogSampleLogCategories.h @@ -1,3 +1,4 @@ +#pragma once #include "CoreMinimal.h" DECLARE_LOG_CATEGORY_EXTERN(LogCogAlways, VeryVerbose, All); @@ -16,5 +17,5 @@ DECLARE_LOG_CATEGORY_EXTERN(LogCogTargetAcquisition, Warning, All); namespace CogSampleLog { - void RegiterAllLogCategories(); + void RegisterAllLogCategories(); } \ No newline at end of file diff --git a/Source/CogSample/CogSampleModule.cpp b/Source/CogSample/CogSampleModule.cpp index 9a8e643..f28d2c5 100644 --- a/Source/CogSample/CogSampleModule.cpp +++ b/Source/CogSample/CogSampleModule.cpp @@ -20,7 +20,7 @@ private: //-------------------------------------------------------------------------------------------------------------------------- void FCogSampleModule::StartupModule() { - CogSampleLog::RegiterAllLogCategories(); + CogSampleLog::RegisterAllLogCategories(); } //--------------------------------------------------------------------------------------------------------------------------