pcy35549
/
D1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[박치영] Inline 관련 수정 및 빌드 시 에러 수정

main
pcyoung 2024-01-05 19:58:08 +09:00
parent 943dcbec31
commit 020aa67ad4
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -77,6 +77,9 @@ DerivedDataCache/*
# Art Resource Folder # Art Resource Folder
/Content/D1Art/* /Content/D1Art/*
# Build
Windows/*
#Rider #Rider
.idea/ .idea/
# Default ignored files # Default ignored files

BIN
Content/ParagonRampage/Characters/Maps/Lighting_Background.umap
View File

Binary file not shown.

3
Source/D1/Components/CollisionComponent.h
View File

@ -52,9 +52,10 @@ public:
FORCEINLINE void SetGameplayTagsIgnore(FGameplayTagContainer& InputGameplayTagContainer) { GameplayTagsIgnore = InputGameplayTagContainer; } FORCEINLINE void SetGameplayTagsIgnore(FGameplayTagContainer& InputGameplayTagContainer) { GameplayTagsIgnore = InputGameplayTagContainer; }
public: public:
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
FORCEINLINE void ActivateCollision(); void ActivateCollision();
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
FORCEINLINE void DeactivateCollision() { bCollisionEnabled = false; } FORCEINLINE void DeactivateCollision() { bCollisionEnabled = false; }
bool IsCollisionEnabled() { return bCollisionEnabled; } bool IsCollisionEnabled() { return bCollisionEnabled; }
bool CanHitActor(AActor* InActor); bool CanHitActor(AActor* InActor);
private: private: