Compare commits

base: neroberovero:122103a77895d75f291696b058420504bb98c6ba

Branches Tags

neroberovero:main

neroberovero:fmod-integration

neroberovero:sharon_saving_loading_3

neroberovero:sharon_saving_loading_2

neroberovero:sharon_saving_loading

neroberovero:angela-inventory

neroberovero:origin/ken-movement

neroberovero:pan-branch

...

compare: neroberovero:322fbc3ade6420dcf5c14b81830c7c1f1528aae4

Branches Tags

neroberovero:main

neroberovero:fmod-integration

neroberovero:sharon_saving_loading_3

neroberovero:sharon_saving_loading_2

neroberovero:sharon_saving_loading

neroberovero:angela-inventory

neroberovero:origin/ken-movement

neroberovero:pan-branch

8 Commits

122103a778 ... 322fbc3ade

Author	SHA1	Message	Date
Ji Yoon Rhee	322fbc3ade	Revert "added some comments to Haesol's implementation for passive skills" ... This reverts commit b888ddbe5d.	2024-08-08 10:01:34 +09:00
Ji Yoon Rhee	0e71da9cf4	Revert "created few AOE actor classes for future skill set usage" ... This reverts commit a1a65b521f.	2024-08-08 10:01:18 +09:00
Ji Yoon Rhee	0f407eb9c4	Revert "push before merge" ... This reverts commit 27e503b8b8.	2024-08-08 10:01:02 +09:00
Ji Yoon Rhee	2a923cdd7f	Reapply "Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5" ... This reverts commit bf65a01a5f.	2024-08-08 10:00:54 +09:00
Ji Yoon Rhee	ca4ae06aef	Reapply "push before merge" ... This reverts commit 5b3217f2e6.	2024-08-08 10:00:47 +09:00
Ji Yoon Rhee	9c5c627276	Reapply "created few AOE actor classes for future skill set usage" ... This reverts commit 420f46c7d3.	2024-08-08 10:00:31 +09:00
Ji Yoon Rhee	b62f72eb81	Reapply "added some comments to Haesol's implementation for passive skills" ... This reverts commit e4628fcd9d.	2024-08-08 09:59:52 +09:00
Ji Yoon Rhee	c9c2c13591	Revert "Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5" ... This reverts commit 122103a778, reversing changes made to e4628fcd9d.	2024-08-08 09:59:18 +09:00

335 changed files with 935 additions and 77 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

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/BP_AnimHaesolHwando.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset (Stored with Git LFS) Normal file

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/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_MPSystem.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBlast.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEExplosion.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEOverTime.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Fire.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_AoEBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/E_AttackStance.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/E_BlockingState.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/E_DamageReactionType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/E_DamageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Damagable.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_ManaUser.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_ConsumableItemBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_ManualPickUpItemBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Tea.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_FoxMarble.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Gochugaru.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Tea.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_WaterBottle.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/E_ConsumableItemType.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_DamageInfo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/AttributeSet/AC_AttributeSystem.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/AttributeSet/I_Buffable.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/AttributeSet/S_AttributeSetInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/CombatSystem/AC_CombatSystem.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/CombatSystem/E_AttackStance.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/CombatSystem/E_BlockingState.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/AC_HPSystem.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/E_DamageReactionType.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/E_DamageType.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/I_Damagable.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/S_DamageInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/MPSystem/AC_MPSystem.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/MPSystem/I_ManaUser.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryHUDWidget.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKM_Soldier_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Pillar_50x500.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/SM_AssetPlatform.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x200.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x300.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_500x500.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Door_400x300.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Door_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Window_400x300.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Window_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire_Sparks01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light02_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Smoke01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Smoke01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Background_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Birds01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Music01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Music_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Wind05.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Wind06.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Steam01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Steam01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/FogBrightnessLUT.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More