d8dcef64e8
Merge branch 'merchant-system' into Turn-Base-System
...
# Conflicts:
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2022-11-14 22:41:33 +00:00
MH261677
593badeca9
Updated AllInventory BP's
...
Updated all the blueprints
2022-11-14 22:40:09 +00:00
f2857b3c57
Updated Combat_UI for Battle Log
2022-11-14 22:30:31 +00:00
MH261677
7a8dead59b
Added Default Item to test
...
Added a default item to the inventory BP.
2022-11-14 20:28:34 +00:00
MH261677
fe75a8c388
Created Inventory BP
...
Created the Inventory UI
2022-11-14 19:50:57 +00:00
MH261677
5ebf6a3431
Updated PlayerInventory->ItemDisplay
...
Added a placeholder jelly image to the first item and finished blueprinting and creating the itemdisplay
2022-11-14 19:47:17 +00:00
MH261677
83da7265d5
Added HealingJelly Item, Added PlayerInventory
...
Added healing jelly item blueprint and started working on the playerinventory UI
2022-11-14 19:22:50 +00:00
MH261677
a40aa57f70
Added all BP Items in the game and updated scripts
...
All Items are added in BP with the values they are meant to have. Starting to now actually implement them into the inventory UI and creating the Inventory UI
2022-11-14 17:42:26 +00:00
3b627518ca
Updated Blueprint Combat UI for Prototype Buttons
2022-11-14 03:04:11 +00:00
19d43413ef
Updated Combat UI for Progress Bars
2022-11-14 00:03:24 +00:00
c23bbb4f08
Added Test Combat Player Character
2022-11-14 00:02:46 +00:00
MH261677
d29bb501c7
Updated Interaction,TempCharacter to cleanup
...
I cleaned up and removed unused functions in both interaction and tempcharacter scripts.
2022-11-13 22:21:51 +00:00
58db9e7459
Updated TurnBaseCombat to Reference HUD Blueprint
2022-11-13 21:41:09 +00:00
bf3b2e3837
Added Combat Test Game Mode Base
2022-11-13 21:41:07 +00:00
MH261677
846b21e4e9
Fixed Interaction Pop-Ups
...
Interaction is now working with the merchant also added interaction class to setup this up.
2022-11-13 16:43:01 +00:00
MH261677
eeaf52df89
Attempted to reference UserWidget
2022-11-13 03:00:21 +00:00
MH261677
4d53a2cdda
Cant even get a widget to open after 4 hours
2022-11-12 18:47:13 +00:00
MH261677
ca90d5fc6e
Working on TraceChannel for merchant hit detect
2022-11-10 16:38:38 +00:00
MH261677
ba713ddb2e
Cleaned up scripts
2022-11-10 12:57:31 +00:00
MH261677
fb981ce2d6
Created Custom FP Character with custom Interact
...
Created a Temp Character script and gave it functionallity, also gave it the custom keybind E so when pressed it displays a log message so I know it works. Also created a temporary gamemode for merchant level
2022-11-10 11:52:10 +00:00
