Commit Graph

140 Commits

Author SHA1 Message Date
MH261677
49a24325ea Updated TempCharacter, WBPHealth
Made the health and gold variables for the character blueprintable to start implimenting them into basic UI for visual representation.
2022-11-19 20:08:00 +00:00
MH261677
e64b4057ac Created Health_Gold UI 2022-11-18 20:05:33 +00:00
MH261677
ba2b6b599c Merge branch 'dev' into merchant-system 2022-11-18 19:20:20 +00:00
MH261677
c835567fac Updated Item Assets
Added the gold value for each of the item assets
2022-11-18 14:54:30 +00:00
MH261677
220b21f2ca Added BuffItem Placeholder
Added the buffitem placeholder to the world. Currently the buffitem just does the same as the healing item.
2022-11-18 13:53:47 +00:00
MH261677
900feee5a9 Updated InventoryComponent and Shop
Fixed InventoryComponent to now work with singular items so you can purchase items from the shop!
2022-11-18 13:07:44 +00:00
9780242271 Added RealTimeCombat Map, Character & GameModeBase 2022-11-17 04:51:33 +00:00
09ec1cb181 Added BP HUD Combat_UI_RT for RealTimeCombat 2022-11-17 04:15:50 +00:00
0b18bcc5c9 Updated CombatCharacter and AI for Tagging 2022-11-17 03:42:35 +00:00
e5e24c848a Updated Prototype Environment for Inventory 2022-11-15 03:40:59 +00:00
9b9cc6f02b Merge branch 'merchant-system' into Turn-Base-System
# Conflicts:
#	Content/Blueprints/WBP_PlayerInventory.uasset
#	Content/Merchant/BP_MerchantGameMode.uasset
2022-11-15 03:28:55 +00:00
MH261677
0c0876770b Updated Inventory System
Added BuffJelly
2022-11-15 03:27:44 +00:00
9d72f60208 Updated TurnBaseCombat for ResourceBar Functionality 2022-11-15 01:12:45 +00:00
189b6d25b8 Updated Combat UI for Resource Bars 2022-11-15 00:43:15 +00:00
bc090192f3 Bugfix Player Inventory for Items Rendering 2022-11-15 00:12:14 +00:00
MH261677
e602d83a31 Updated Inventory system for Items in UI
The Inventory System is working fully with the healing jelly working
2022-11-15 00:04:46 +00:00
a976775e61 Updated TurnBaseCombat for Enemy Death onHealthZero 2022-11-14 23:41:55 +00:00
b20004e599 Updated TurnBaseCombat to Start Combat onCollision 2022-11-14 23:24:37 +00:00
c6e7dbca62 Added Prototype Gun to Player Character 2022-11-14 23:05:35 +00:00
02c14525a5 Added BungeeMan for Temp Enemy 2022-11-14 23:01:06 +00:00
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