diff --git a/.gitignore b/.gitignore index 031b6393..0647c71e 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,9 @@ DerivedDataCache/* # Art Resource Folder /Content/D1Art/* +# Build +Windows/* + #Rider .idea/ # Default ignored files diff --git a/Content/ParagonRampage/Characters/Maps/Lighting_Background.umap b/Content/ParagonRampage/Characters/Maps/Lighting_Background.umap index 71cb7efd..13c06a41 100644 Binary files a/Content/ParagonRampage/Characters/Maps/Lighting_Background.umap and b/Content/ParagonRampage/Characters/Maps/Lighting_Background.umap differ diff --git a/Source/D1/Components/CollisionComponent.h b/Source/D1/Components/CollisionComponent.h index 89ebe7bd..12f78c74 100644 --- a/Source/D1/Components/CollisionComponent.h +++ b/Source/D1/Components/CollisionComponent.h @@ -52,9 +52,10 @@ public: FORCEINLINE void SetGameplayTagsIgnore(FGameplayTagContainer& InputGameplayTagContainer) { GameplayTagsIgnore = InputGameplayTagContainer; } public: UFUNCTION(BlueprintCallable) - FORCEINLINE void ActivateCollision(); + void ActivateCollision(); UFUNCTION(BlueprintCallable) FORCEINLINE void DeactivateCollision() { bCollisionEnabled = false; } + bool IsCollisionEnabled() { return bCollisionEnabled; } bool CanHitActor(AActor* InActor); private: