merge
This commit is contained in:
commit
2bf5e5bbcc
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset
(Stored with Git LFS)
Binary file not shown.
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/Behavior/BT_PuzzleNPCBase.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face_base.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face_base.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_base.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_base.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_normals.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_normals.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_roughness.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_roughness.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_base.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_base.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_emit.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_emit.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_base.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_base.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_normal.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_base.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_base.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_normals.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_normals.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_roughness.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_roughness.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.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/NPC/Spring-Sanin/BP_SanIn.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.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/ProjectileBP/BP_LargeGonggiStone.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
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/Illusions/Assets/Combat/sfx_combat_rockfall.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.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)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,17 +1,17 @@
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2GameMode.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2GameMode.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAutomaticPickUp.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYConsumableItem.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYInteractableActor.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYEnemyBase.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYGameStateBase.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYManualPickUp.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYMoneyAutoPickUp.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYProjectileAttackComponent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYSaveGameActor.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYProjectileAttackComponent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAttackComponent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAutomaticPickUp.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYEnemyBase.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYInteractableActor.h
|
||||
|
Binary file not shown.
@ -1,23 +1,23 @@
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSettings.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAmbientSound.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBus.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshotReverb.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODVCA.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSettings.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkSettings.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkComponent.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkSettings.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODAssetLookup.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSection.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLinkEditor\Private\FMODAudioLinkSettingsFactory.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h
|
||||
D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h
|
||||
|
Loading…
x
Reference in New Issue
Block a user