Compare commits

base: neroberovero:64cd8678124b6ddaa9156713586e971438b937da

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:d6c73f9f83add29e8fe0002428000dd57bad70f1

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

7 Commits

64cd867812 ... d6c73f9f83

Author	SHA1	Message	Date
Ji Yoon Rhee	d6c73f9f83	Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5	2024-08-08 08:51:27 +09:00
Ji Yoon Rhee	f13816d379	push before merge	2024-08-08 08:49:37 +09:00
Ji Yoon Rhee	6b44048ac4	created few AOE actor classes for future skill set usage	2024-08-08 08:49:32 +09:00
Ji Yoon Rhee	36ffa58b4a	temp commit of binaries before merging	2024-08-08 08:49:17 +09:00
Ji Yoon Rhee	fde4b47b80	added some comments to Haesol's implementation for passive skills	2024-08-08 08:49:15 +09:00
sharon2pan	4d1ee10dac	added 3d interactables	2024-08-02 19:22:20 -04:00
sharon2pan	dc95e27bd3	delete water bottle + new interactables added	2024-07-26 21:25:22 -04:00

14 changed files with 29 additions and 8 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/Binaries/Win64/UnrealEditor-hwanyoung2-9743.dll Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Sesame.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/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio-0002.dll Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor-0002.dll Normal file

View File

Binary file not shown.