Commit Graph

23 Commits

Author SHA1 Message Date
3f5c7bcf1c Bugfix Merchant Unable to Purchase Items 2023-03-28 03:43:31 +01:00
Marcel Hara
6f9f95ab9d Attempted fix widget to merchant system 2023-03-14 13:04:33 +00:00
c5409fcaa7 Removed Merchant Soft Lock for Build
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
Emily Taylor
3982712189 Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine
Goat enemy fbx and material, merchant character and material and merchant shop untextured meshes in engine.
2023-03-06 16:28:04 +00:00
MARCEL HARA
5e448c897d Updated Widgets to fix scaling issue
Fixed scaling issue on all widgets to fit all monitor types
2023-02-20 16:03:25 +00:00
Marcel Hara
d658c63627 Updated WBP_ShopSelector
Got rid of it casting from tempcharacter but instead it casts from interaction which then activates a function in interaction which activates a different function in tempcharacter
2023-01-30 17:20:22 +00:00
MARCEL HARA
810b4b1680 TemporarilyBroken TempCharacter.cpp
Attempted to fix the close button currently it crashes.
2023-01-26 18:12:24 +00:00
MARCEL HARA
2f22ec811f Updated Merchant_UI
Removed things being removed from parent and transferred it from code to fix many bugs, Also fixed text being instantly displayed once you talk to the merchant again
2023-01-26 17:41:51 +00:00
MARCEL HARA
c58d5d5592 Updated BP_OPENDIAL
Added a custom function which gets triggered in the Interaction.cpp
2023-01-23 17:41:30 +00:00
MH261677
b9d87ee07b Updated Unreal version to 5.1 2023-01-21 14:19:49 +00:00
MH261677
084ad419c5 Updated TempCharacter.cpp
Fixed double linetracing issue
2023-01-16 23:41:22 +00:00
MH261677
355dd06aae Updated BP_ShopSelector,WBP_BuyHealing
Added it so when you click the arrows it swaps to the different widgets and made the widget remove from viewport
2023-01-16 21:25:18 +00:00
MH261677
6b131213a6 Created WBP_BuyBuff
Created the buy screen for the buff jelly
2023-01-16 21:24:24 +00:00
MH261677
77328aa887 Created WBP_BuyHealing
Created the buy healing jelly promt and gave it functionality to trigger buyitem which triggers linetrace logic
2023-01-16 20:42:16 +00:00
MH261677
58243e8ccc Updated BP_ShopSelector, BP_MerchantInteraction
Added interactivity for the buttons to activate functions in the interaction.cpp
2023-01-16 17:01:04 +00:00
MH261677
e7fa8f4c63 Updated BP_ShopSelector
Added a close button which re-enables all the input again by calling a function in TempChar
2023-01-15 16:14:03 +00:00
MH261677
808b567d6f Created BP_ShopSelector
Created the widget for the item selector when you are in the shop
2023-01-15 15:06:30 +00:00
MH261677
a582a05a59 Changed BP_Interaction name to BP_MerchantInteract
Changed BP_Interaction name to BP_MerchantInteraction
2023-01-14 20:34:38 +00:00
MH261677
c107c9a490 Updated Merchant
Fixed crash error and merchant dialouge box pops up now, Started working on item stacking
2023-01-12 13:05:43 +00:00
MH261677
8c69f58a97 Updated BP_OPENDIAL, Interaction.cpp
Changed the text in the widget and gave it a little animation. Made the Wait timer in interaction changeable in the editor.
2022-11-28 23:15:41 +00:00
MH261677
b5772a024c Updated Interaction.cpp
Added a wait timer to close the widget once open automatically
2022-11-28 22:52:51 +00:00
MH261677
b7dd592d2c Created Player folder
Organized the blueprints into more folders and cleaned up unreal project
2022-11-23 17:30:38 +00:00
MH261677
77b32edde4 Organized Content Browser
Organized the content browser to make it easier to know where everything is
2022-11-23 17:26:35 +00:00