Merge branch 'main' into fmod-integration

still working on implementing the CheckForIntertactable(). the ui is buggy
implemented dashing on blueprints
2024-06-12 20:01:16 -04:00 · 2024-06-12 22:48:50 +09:00 · 2024-06-12 22:47:53 +09:00
11 changed files with 22 additions and 14 deletions
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Dash.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Dash.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset
--- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset
+++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset
--- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset
+++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset
--- a/hwanyoung2/Content/Hwanyoung/UI/Images/inventory-user-interface-background.uasset
+++ b/hwanyoung2/Content/Hwanyoung/UI/Images/inventory-user-interface-background.uasset
--- a/hwanyoung2/Content/Hwanyoung/UI/inventory-user-interface-background.uasset
+++ b/hwanyoung2/Content/Hwanyoung/UI/inventory-user-interface-background.uasset
--- a/hwanyoung2/Content/ExternalActors/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset
+++ b/hwanyoung2/Content/ExternalActors/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset
--- a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp
+++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp
@ -101,6 +101,9 @@ void Ahwanyoung2Character::CheckForInteractables()

 void Ahwanyoung2Character::Tick(float DeltaTime)
 {
+	Super::Tick(DeltaTime);
+
+	CheckForInteractables();
 }

 //////////////////////////////////////////////////////////////////////////
--- a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h
+++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h
@ -111,6 +111,5 @@ protected:
 	// To add mapping context
 	virtual void BeginPlay();

-
 };
Author	SHA1	Message	Date
benroshio	32ea3d2d49	Merge branch 'main' into fmod-integration	2024-06-12 20:01:16 -04:00
Ji Yoon Rhee	8b5c9a1f4b	still working on implementing the CheckForIntertactable(). the ui is buggy	2024-06-12 22:48:50 +09:00
Ji Yoon Rhee	ce82fffdda	implemented dashing on blueprints	2024-06-12 22:47:53 +09:00