Commit Graph

72 Commits

Author SHA1 Message Date
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
7be90cc087 Updated Combo List for New Combos 2022-11-14 22:40:22 +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
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
b765f633d6 Bugfix Unreal Compliation Workaround for TQueues 2022-11-14 11:55:11 +00:00
bb544d2f35 Updated TurnBaseCombat for Comabat Log 2022-11-14 11:31:51 +00:00
e5af4538ea Updated TurnBaseCombat for Code Cleanup 2022-11-14 03:24:15 +00:00
7fb9935e70 Updated TurnBaseCombat to Show Cursor 2022-11-14 03:18:50 +00:00
ce4c2294c4 Updated TurnBaseCombat for Simple Opponent AI 2022-11-14 03:15:26 +00:00
329cf183b9 Updated TurnBaseCombat for Button Functionality 2022-11-14 03:05:25 +00:00
3b627518ca Updated Blueprint Combat UI for Prototype Buttons 2022-11-14 03:04:11 +00:00
38ab749ecc Updated TurnBaseCombat for Combo String Validation 2022-11-14 01:11:37 +00:00
2a92b5577f Added Interfacing to Blueprint UI via Game State 2022-11-14 00:04:44 +00:00
df51750a5e Added Tag to Combat Test Character 2022-11-14 00:03:59 +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
c085aae130 Refactored Variable Naming Conventions to Unreal 2022-11-13 21:41:08 +00:00
bf3b2e3837 Added Combat Test Game Mode Base 2022-11-13 21:41:07 +00:00
0ce1fd4a1d Added Combat Test Map 2022-11-13 19:19:45 +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