Merge branch 'main' into Chaz
This commit is contained in:
commit
9329fd919b
@ -238,6 +238,7 @@ ManualIPAddress=
|
||||
+Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.")
|
||||
+Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ")
|
||||
+Profiles=(Name="WaterBodyCollision",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="",CustomResponses=((Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="Default Water Collision Profile (Created by Water Plugin)")
|
||||
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="GroundOnly")
|
||||
-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
|
||||
-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
|
||||
-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
|
||||
|
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Rice.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Rice.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookedItemSlot.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookedItemSlot.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftedItemSlot.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftedItemSlot.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingHUDWidget.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingHUDWidget.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingItemSlot.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingItemSlot.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_IngredientItemSlot.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_IngredientItemSlot.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar2.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar3.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar3.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MPC_CircularProgressBar.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MPC_CircularProgressBar.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar2.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar3.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar3.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/KTP_Effect/Particles/Fly/Expolison_02_06.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/KTP_Effect/Particles/Fly/Expolison_02_06.uasset
(Stored with Git LFS)
Binary file not shown.
@ -5,3 +5,4 @@ Date/Time,Word Count,en,ko-KR
|
||||
2025.04.30-23.53.17,600,600,0
|
||||
2025.04.30-23.59.29,600,592,0
|
||||
2025.05.01-18.43.00,632,632,0
|
||||
2025.05.11-12.05.59,1260,1260,0
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user