neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
benroshio 2024-11-29 22:24:36 -05:00
commit bff8f71353
38 changed files with 77 additions and 5023 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_Goblin.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Goblin.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Sanin.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/EQS/EQS_Teleport.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/ABP_SaninImproved.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/attack/06_chanting/Inplace/06_chanting_all.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/damage/Inplace/BP_SaninFrontDamage.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/locomotion/BSrun_loop.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/StandingMeleeAttackDownward_2__UE.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/StandingMeleeAttackDownward_2__UE_Montage.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Jump1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Rock_Material.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_AO.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_Bump.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_Cavity.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_Fuzz.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_Gloss.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Textures/Mossy_Boulder_ulldfii_Mid_2K_Specular.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Mossy_Boulder_ulldfii_Mid.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Spring.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_DestroyableActors.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/MegaMagicVFXBundle/VFX/MagicalExplosionsVFX/VFX/EarthExplosion/Systems/N_EarthExplosion.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Intermediate/CachedAssetRegistry.bin
View File

Binary file not shown.

BIN
hwanyoung2/Intermediate/ReimportCache/3688439234.bin
View File

Binary file not shown.

BIN
hwanyoung2/Saved/Autosaves/PackageRestoreData.json
View File

Binary file not shown.

2206
hwanyoung2/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini
View File

File diff suppressed because one or more lines are too long

82
hwanyoung2/Saved/Config/WindowsEditor/Engine.ini
View File

@ -1,82 +0,0 @@
[Core.System]
Paths=../../../Engine/Content
Paths=%GAMEDIR%Content
Paths=../../../Engine/Plugins/Bridge/Content
Paths=../../../Engine/Plugins/Animation/ControlRigSpline/Content
Paths=../../../Engine/Plugins/Animation/IKRig/Content
Paths=../../../Engine/Plugins/Animation/ControlRig/Content
Paths=../../../Engine/Plugins/Developer/AnimationSharing/Content
Paths=../../../Engine/Plugins/VirtualProduction/Takes/Content
Paths=../../../Engine/Plugins/Editor/GeometryMode/Content
Paths=../../../Engine/Plugins/Editor/GLTFImporter/Content
Paths=../../../Engine/Plugins/Editor/ModelingToolsEditorMode/Content
Paths=../../../Engine/Plugins/Editor/SpeedTreeImporter/Content
Paths=../../../Engine/Plugins/Runtime/AudioWidgets/Content
Paths=../../../Engine/Plugins/Runtime/AudioSynesthesia/Content
Paths=../../../Engine/Plugins/Editor/BlueprintHeaderView/Content
Paths=../../../Engine/Plugins/Runtime/GeometryProcessing/Content
Paths=../../../Engine/Plugins/Runtime/Metasound/Content
Paths=../../../Engine/Plugins/Runtime/MeshModelingToolset/Content
Paths=../../../Engine/Plugins/Runtime/GameplayStateTree/Content
Paths=../../../Engine/Plugins/Runtime/ResonanceAudio/Content
Paths=../../../Engine/Plugins/Runtime/WaveTable/Content
Paths=../../../Engine/Plugins/Runtime/Synthesis/Content
Paths=../../../Engine/Plugins/Runtime/StateTree/Content
Paths=../../../Engine/Plugins/Experimental/ChaosCaching/Content
Paths=../../../Engine/Plugins/Experimental/ChaosClothEditor/Content
Paths=../../../Engine/Plugins/Experimental/ChaosSolverPlugin/Content
Paths=../../../Engine/Plugins/Experimental/ChaosNiagara/Content
Paths=../../../Engine/Plugins/FX/Niagara/Content
Paths=../../../Engine/Plugins/Experimental/Dataflow/Content
Paths=../../../Engine/Plugins/Experimental/GeometryCollectionPlugin/Content
Paths=../../../Engine/Plugins/Experimental/Landmass/Content
Paths=../../../Engine/Plugins/Experimental/MeshLODToolset/Content
Paths=../../../Engine/Plugins/Experimental/GeometryFlow/Content
Paths=../../../Engine/Plugins/Experimental/FullBodyIK/Content
Paths=../../../Engine/Plugins/Experimental/MeshModelingToolsetExp/Content
Paths=../../../Engine/Plugins/Experimental/PythonScriptPlugin/Content
Paths=../../../Engine/Plugins/Enterprise/GLTFExporter/Content
Paths=../../../Engine/Plugins/Interchange/Runtime/Content
Paths=../../../Engine/Plugins/Experimental/UVEditor/Content
Paths=../../../Engine/Plugins/Experimental/WaterExtras/Content
Paths=../../../Engine/Plugins/Enterprise/DatasmithContent/Content
Paths=../../../Engine/Plugins/Media/MediaPlate/Content
Paths=../../../Engine/Plugins/Experimental/Water/Content
Paths=../../../Engine/Plugins/MovieScene/SequencerScripting/Content
Paths=../../../Engine/Plugins/2D/Paper2D/Content
Paths=../../../Engine/Plugins/Media/MediaCompositing/Content
Paths=../../../Engine/Plugins/Editor/ObjectMixer/LightMixer/Content
Paths=../../../Engine/Plugins/Editor/ObjectMixer/ObjectMixer/Content
Paths=../../../../../../Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Plugins/FMODStudio/Content
Paths=../../../Engine/Plugins/Runtime/GameplayInteractions/Content
Paths=../../../Engine/Plugins/Runtime/MassEntity/Content
Paths=../../../Engine/Plugins/Runtime/SmartObjects/Content
Paths=../../../Engine/Plugins/Animation/MotionWarping/Content
Paths=../../../Engine/Plugins/Experimental/Animation/ContextualAnimation/Content
Paths=D:/GitHub/Personal Projects/Illusion-UE5/hwanyoung2/Plugins/FMODStudio/Content
[/Script/UnrealEd.UnrealEdEngine]
TemplateMapInfos=(ThumbnailTexture=None,Thumbnail="/Engine/Maps/Templates/Thumbnails/OpenWorld.OpenWorld",Map="/Engine/Maps/Templates/OpenWorld",DisplayName="Open World",Category="OpenWorld")
TemplateMapInfos=(ThumbnailTexture=None,Thumbnail="/Engine/Maps/Templates/Thumbnails/Basic.Basic",Map="/Engine/Maps/Templates/Template_Default",DisplayName="Basic",Category="")
[/Script/AndroidPlatformEditor.AndroidSDKSettings]
SDKPath=(Path="")
NDKPath=(Path="")
JavaPath=(Path="")
[/Script/UdpMessaging.UdpMessagingSettings]
EnabledByDefault=False
EnableTransport=True
bAutoRepair=True
MaxSendRate=1.000000
AutoRepairAttemptLimit=10
WorkQueueSize=1024
bStopServiceWhenAppDeactivates=True
UnicastEndpoint=0.0.0.0:0
MulticastEndpoint=230.0.0.1:6666
MessageFormat=CborPlatformEndianness
MulticastTimeToLive=1
EnableTunnel=False
TunnelUnicastEndpoint=
TunnelMulticastEndpoint=

2686
hwanyoung2/Saved/Logs/hwanyoung2.log
View File

File diff suppressed because one or more lines are too long

23
hwanyoung2/Saved/SourceControl/UncontrolledChangelists.json
View File

@ -1,23 +0,0 @@
{
"version": 1,
"changelists": [
{
"guid": "00000000000000000000000000000000",
"description": "Default Uncontrolled Changelist",
"files": [
"D:/GitHub/Personal Projects/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Levels/Spring.umap",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_Weapon_Club.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_GoblinNPC.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_Goblin.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Goblin.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/I_Damagable.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/AC_HPSystem.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/NPC/StandingMeleeAttackDownward_2__UE.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/NPC/StandingMeleeAttackDownward_2__UE_Montage.uasset",
"C:/Users/pan.sha/Desktop/Illusion-2/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Levels/Spring.umap"
]
}
]
}