Commit Graph

118 Commits

Author SHA1 Message Date
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
5dce4dc603 Updated InventoryComponent
Added comment
2022-11-24 00:13:20 +00:00
MH261677
57b532c256 Updated WBP_PlayerInventory
Cleaned up the inventory UI and removed unused Blueprint code
2022-11-23 19:20:32 +00:00
MH261677
9357806178 Updated WBP_ItemDisplay
Made the item display larger and cleaner, Also added a background to the item
2022-11-23 18:16:14 +00:00
MH261677
26bbe083df Updated WBP_ItemDisplay, WBP_PlayerInventory
Changed and resized both the UIS to fit items better and make the whole inventory look a lot cleaner
2022-11-23 18:13:13 +00:00
MH261677
09adfcad27 Updated WBP_PlayerInventory
Started to work on Inventory UI and re-sized it to be 1920x1080
2022-11-23 17:45:32 +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
45369c4dc7 Created Inventory_UI Folder
Moved all inventory UI to the folder and removed Shop UI as not used anymore
2022-11-23 17:29:14 +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
MH261677
36bb1a2265 Updated PlayerInventory
Made the inventory look slightly nicer, going to work on a nicer alpha version of the UI after this commit
2022-11-23 01:56:22 +00:00
MH261677
7430029db2 BugFix WBP_PlayerInventory
Fixed cursor still showing up when closing and re-opening the inventory.
2022-11-23 01:45:24 +00:00
MH261677
7dc6f677d4 Updated WBP_PlayerInventory
Added an override on keypressed so the user can press tab again to close the inventory. Also fixed the widget not being a focusable
2022-11-23 01:38:45 +00:00
MH261677
7140faf22b Updated EatableItems
Seperated Items into functional sub-variables that do other stuff instead of just healing the player no matte the item you make
2022-11-23 00:56:33 +00:00
MH261677
783e13075c Updated TempCharacter
Made the linetrace boolean a global in the headerfile for potential future enemy detection
2022-11-23 00:55:55 +00:00
MH261677
168a43d751 Updated BaseItem and ItemBPS
Gave both items booleans to make the code differentiate what the item does to the player.
2022-11-23 00:51:00 +00:00
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
cb9c2bcb27 Updated BaseItem, TempCharacter
Removed more unused code to make the scripts more readable and optimized.
2022-11-18 19:25:10 +00:00
MH261677
ba2b6b599c Merge branch 'dev' into merchant-system 2022-11-18 19:20:20 +00:00
MH261677
7623976bd3 Updated TempCharacter
Cleaned Up Script 18/11/2022
2022-11-18 19:19:04 +00:00
MH261677
3572f066c1 Updated EatableItems
Deleted unused code
2022-11-18 18:19:14 +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
811856b219 Updated InventoryComponent & TempCharacter
Made it so the buy system is universal meaning any devs will not have to keep adding more if statements just to set the items price. It can all be done in editor now and it all handles itself in the code.
2022-11-18 14:53:22 +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
cee5188d47 Updated TempCharacter
Updated the buy function and made it more accessible to adding other items.
2022-11-18 13:28:22 +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
edd39e5528 Updated Project Settings for Build 2022-11-15 03:48:02 +00:00
2977b84cfc Merge pull request #3 from Games-Academy-Student-Work-22-23/dev
Merged Inventory System with the Turned Based Combat System
2022-11-15 03:43:01 +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
c852de30ec Updated TurnBaseCombat for Simple Combat AI 2022-11-15 02:02:59 +00:00
96273d16d9 Updated Prototype Environment for TurnBaseCombat 2022-11-15 01:45:52 +00:00
dab9182814 Merge remote-tracking branch 'origin/Level' into Turn-Base-System 2022-11-15 01:35:02 +00:00
KACPER Szelest
dbe213ef77 Updated Prototype level
I have updated the prototype level to include the environment assets and added a small material to a big rock
2022-11-15 01:34:32 +00:00
e57c99d103 Bugfix TurnBaseCombat Not Checking Resource Count 2022-11-15 01:21:47 +00:00
KACPER Szelest
f6c59adda0 Added empty level "prototype"
I added an empty level called prototype to wel.. prototype on
2022-11-15 01:20:37 +00:00
KACPER Szelest
181fcd0103 Added Environment assets
I added some assets that could be used for the tutorial level
2022-11-15 01:18:26 +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
MH261677
91667f89b2 Updated MerchantGameMode
Added a print string to tell the player to press TAB to open the inventory
2022-11-15 00:16:26 +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
521ab6c089 Updated TurnBaseCombat to End Combat onDeath 2022-11-14 23:29:16 +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