Merge branch 'main' into new-windows
This commit is contained in:
commit
057b556d54
63 files changed
+358
-372
No files matched your search
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user