Compare commits

base: neroberovero:8178560cfd1447451c292bd6f90c996676cad894

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:2a5674c5244b156d254890bad4c11217e071084d

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

3 Commits

8178560cfd ... 2a5674c524

Author	SHA1	Message	Date
sharon2pan	2a5674c524	Merge branch 'sharon_saving_loading_2' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 into sharon_saving_loading_2	2024-09-20 01:18:25 -04:00
Ji Yoon Rhee	564f2a80cd	crafting system is fully functional	2024-09-17 00:05:53 +09:00
Ji Yoon Rhee	63d4092c2c	level 1, block out started	2024-09-15 08:48:19 +09:00

265 changed files with 755 additions and 27 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/BP_HYGameMode.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BP_NPCControllerBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BehaviorTree/BB_NPCBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BehaviorTree/BT_NPCBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BehaviorTree/E_NPCBehaviorStateBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.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/Levels/Spring.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingHUDWidget.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingItemSlot.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_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/KTInteractionPropVol2/Animation/ANIM_BesideTable_Close.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_BesideTable_Open.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Box_Close.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Box_Open.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Closet_Close.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Closet_Open.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_HalfChest_Close.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_HalfChest_Open.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Mirror_Flip.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Mirror_Hide.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_ShelfCabinet_Close.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_ShelfCabinet_Open.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_StorageCabinets_Close.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_StorageCabinets_Open.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Tabletop_Close.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Animation/ANIM_Tabletop_Open.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_BesideTable_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_BesideTable_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_BesideTable_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Box_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Box_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Box_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Candlestick.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Closet_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Closet_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Closet_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Halfchest_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Halfchest_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Halfchest_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Mirror_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Mirror_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Mirror_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_ShelfCabinet_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_ShelfCabinet_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_ShelfCabinet_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_StandLighting.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_StorageCabinets_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_StorageCabinets_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_StorageCabinets_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Tabletop_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Tabletop_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Blueprints/BP_Tabletop_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Icon/T_KeyE_Icon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Level/Demo.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_BesideTable2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Beside_Table3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Box_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Box_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Closet_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Closet_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Halfchest_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Halfchest_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Mirror_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Mirror_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_ShelfCabinet_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_ShelfCabinet_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_StandLighting_EM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_StorageCabinets_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_StorageCabinets_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Tabletop_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/MI_Tabletop_3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_BesideTable.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_Box.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_Candlestick.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_Closet.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_Halfchest.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_Mirror.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_Mirror_Glass.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_ShelfCabinet.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_StandLighting.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_StorageCabinets.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Material/M_Tabletop.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/BesideTable/PA_BesideTable.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/BesideTable/SKEL_BesideTable.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/BesideTable/SK_BesideTable.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Box/PA_Box.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Box/SKEL_Box.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Box/SK_Box.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Candlestick/SM_Candlestick.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Closet/PA_Closet.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Closet/SKEL_Closet.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Closet/SK_Closet.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Halfchest/PA_Halfchest.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTInteractionPropVol2/Mesh/Halfchest/SKEL_Halfchest.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