Commit Graph

54 Commits

Author SHA1 Message Date
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
MH261677
0c0876770b Updated Inventory System
Added BuffJelly
2022-11-15 03:27:44 +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
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
MH261677
593badeca9 Updated AllInventory BP's
Updated all the blueprints
2022-11-14 22:40:09 +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
MH261677
785974e169 Updated TempCharacter
Commented the headerFile for tempcharacter.h
2022-11-14 16:58:20 +00:00
MH261677
83d4d16588 Updated BaseItem,Jelly1,Inventory Component,Temp
Updated all the scripts adding more functionality, Currently just added a very basic Use item and it giving the character health.
2022-11-14 16:52:57 +00:00
MH261677
8f0a770bfb Removed ItemPurchaseComponent script
Removed the script as I am not using it for now and solely sticking to creating the inventory system and items currently.
2022-11-14 16:52:04 +00:00
MH261677
7699a088ae Added Jelly1 and ItemPurchaseComponent class
Jelly1 is the test item i am creating and i also added a health variable for the temp character
2022-11-14 15:53:50 +00:00
MH261677
e070b32f0e Created BaseItem and InventoryComponent for Items
Created both the baseitem and inventorycomponent class to start adding in the custom items to the game.
2022-11-14 14:57:02 +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
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
cdab08dcdf Added Dialouge box for Shop 2022-11-11 23:33:37 +00:00
MH261677
f632a010a4 Refactored TempCharacter code 2022-11-11 22:21:10 +00:00
MH261677
2c7a717617 Interaction between player and merchant works. 2022-11-11 20:35:41 +00:00
MH261677
8ee792226c LineTrace works and is detecting objects.
LineTrace works and is detecting objects from the player using the interact button. Also cleaned up some scripts and deleted unused MerchantTriggerBox script.
2022-11-11 20:21:44 +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
38ab588226 Added comments on what next to do for merchant 2022-11-10 11:56:19 +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
MH261677
d96c540bcf Cleaned Up Project
Deleted Old enemycollision script and deleted thirdperson content
2022-11-10 10:15:43 +00:00
MH261677
25fa3d3414 Started working on Merchant Logic
Started to create the base merchant trigger box to start making the interaction between player and merchant npc
2022-11-10 01:09:02 +00:00
MH261677
bfe2de2d5d Added interact input key E 2022-11-10 00:03:09 +00:00
MH261677
48ca848710 Specficially ignored Riderlink in .gitignore 2022-11-09 23:55:31 +00:00
MH261677
96dd28f1b1 Ignored just Plugins folder to avoid errors 2022-11-09 23:27:39 +00:00
bea0e1b735 Updated TurnBaseCombat to Reference Actors
Grabs all actors active within scene
2022-11-09 21:24:36 +00:00
5907d5dbe8 Updated TurnBaseCombat for Switching Active Roles
Added Switching Active Roles and Constrained Active Action Points
2022-11-09 21:03:47 +00:00
b678c25377 Added Base TurnBasedComabat System WIP 2022-11-09 20:32:31 +00:00
bcd8127346 Revert "Added .gitignore for all Rider related plugins"
This reverts commit ab922824e2.
2022-11-09 20:31:47 +00:00
MH261677
ab922824e2 Added .gitignore for all Rider related plugins
Gitignore is now working for all IDES and languages.
2022-11-09 17:13:01 +00:00
MH261677
14d07f375a Added Rider to .gitignore 2022-11-09 17:05:20 +00:00
MH261677
94574da7c4 Added enemy test player
created a simple object which will act as the test collision for enemy player.
2022-11-07 17:41:34 +00:00
MH261677
aad21aa491 Added Enemycollision script
Added enemy collision script and made it output the player being hit.
2022-11-07 17:40:38 +00:00
MH261677
d6b1a1d0c2 Started working on basic enemy collision 2022-11-07 01:07:41 +00:00
MH261677
4fa8f85a17 Fixed some personal engine issues
Had a problem where things were not appearing.
2022-11-07 00:56:51 +00:00
Marcel Hara
8a30db0118 Got rid of old gamemode and added new working one 2022-10-24 00:55:18 +01:00
Marcel Hara
bc96dc4556 Added a plane to the main level
added a plane to stop the character just falling into the void
2022-10-24 00:54:12 +01:00
Marcel Hara
e928b223c8 Added Thirdperson Starter Content
Added the third person starter content in the game so I can start making the 3rd person to 1st person switch mechanic.
2022-10-24 00:52:12 +01:00
3fad4a2e13 Updated Readme.md 2022-10-22 16:24:07 +01:00
41c3c015a6 Updated Project Configuration
It now reflects our targeted platforms and custom game mode
2022-10-22 16:20:05 +01:00
e45f874147 Added VSCode Workspace File for VSCode Users 2022-10-22 16:04:32 +01:00
dd140623c3 Updated .gitignore to Handle VSCode IDE 2022-10-22 16:00:23 +01:00
98e28b1fce Merge branch 'main' into dev 2022-10-22 15:42:12 +01:00