Merge branch 'new-windows' of https://github.com/arnaud-jamin/Cog into new-windows

This commit is contained in:
Arnaud Jamin committed 2024-01-03 19:20:43 -05:00
commit 78ec4d06fa
63 files changed
+358 -372

No files matched your search

+6 -6
View File
@@ -23,12 +23,6 @@ class ACogSampleGameState : public AGameStateBase
private:
//---------------------------------------------------------------------------------
// To make sure it doesn't get garbage collected.
//---------------------------------------------------------------------------------
UPROPERTY()
TObjectPtr<UObject> CogWindowManagerRef = nullptr;
//---------------------------------------------------------------------------------
// The game state has an AbilitySystemComponent to serve as the default instigator
// for effects that are not applied by characters.
@@ -36,6 +30,12 @@ private:
UPROPERTY()
UCogSampleAbilitySystemComponent* AbilitySystemComponent = nullptr;
//---------------------------------------------------------------------------------
// To make sure it doesn't get garbage collected.
//---------------------------------------------------------------------------------
UPROPERTY()
TObjectPtr<UObject> CogWindowManagerRef = nullptr;
#if ENABLE_COG
void InitializeCog();