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
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
