MH261677
1d6e0171c4
Created BP_GoldCount in Blueprints/Display_UI
...
Started to create the GoldCounter to display the players gold
2023-01-14 20:38:02 +00:00
MH261677
29c3fdcf09
Updated Interaction, TempCharacter.cpp
...
Created InputDisabler functions to disable player controls when dialouge box stops to start working on merchant
2023-01-14 20:35:49 +00:00
MH261677
a582a05a59
Changed BP_Interaction name to BP_MerchantInteract
...
Changed BP_Interaction name to BP_MerchantInteraction
2023-01-14 20:34:38 +00:00
MH261677
cd745b086b
Updated BaseItem, InventoryComponent.cpp
...
Fixed an issue where the final item was not dissapearing, added item stacking so when purchasing the same item it will stack instead of being seperate instances.
2023-01-12 15:21:32 +00:00
MH261677
3710f33e74
Updated Inventory System
...
Done it so the items from the inventory now get removed when used instead of one item never being able to be removed
2023-01-12 13:56:30 +00:00
MH261677
9878f0f370
Updated ItemDisplay WBP
...
Added an item stack to the number to start creating stackable items
2023-01-12 13:56:02 +00:00
MH261677
c107c9a490
Updated Merchant
...
Fixed crash error and merchant dialouge box pops up now, Started working on item stacking
2023-01-12 13:05:43 +00:00
320a74d4bb
Added Stub for OnInteract Event
2023-01-06 13:55:38 +00:00
6096d5a783
Added Interactable Environment Actor Component Class
2023-01-06 13:43:39 +00:00
MARCEL HARA
c7d1394e98
Updated Action Mapping from Right to Left Click
2022-11-29 17:38:39 +00:00
MARCEL HARA
87e0bb06de
Bugfix TimeToInit Combat to 0.1f
2022-11-29 17:38:02 +00:00
MARCEL HARA
2512a4950e
Updated TempCharacter.cpp
...
cleared unused header file
2022-11-29 16:40:50 +00:00
3e93e686dd
Updated Main Menu for Merchant
2022-11-29 16:13:30 +00:00
af1813fd9a
Merge branch 'merchant-system' into Turn-Base-System-V2
...
# Conflicts:
# Config/DefaultEngine.ini
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/Merchant/BP_MerchantGameMode.uasset
2022-11-29 15:53:39 +00:00
MH261677
7199ee76a3
Updated Items
...
Started to create item stacks and fix item not dissapearing bug
2022-11-29 15:44:00 +00:00
MH261677
cc9384a9c1
Updated BP_BuffJelly
...
Gave BuffJelly a unique ID of 1
2022-11-29 14:19:43 +00:00
MH261677
ff733f2ab0
Revert "Updated BaseItem.h"
...
This reverts commit d365fa6327
2022-11-29 14:18:05 +00:00
MH261677
d365fa6327
Updated BaseItem.h
...
Changed it so no one can edit the original value ID of an item
2022-11-29 14:16:55 +00:00
MH261677
f52ea5efb8
Overhauled Items
...
Gave every single item a unique ID so no matter the item the ID will always be different
2022-11-29 14:15:20 +00:00
MH261677
3360ea2031
Updated TempCharacter,TempCharacter.cpp
...
Gave a max inventory slots of 5 for testing purposes and Refactored code in TempCharacter.cpp
2022-11-29 12:55:46 +00:00
MH261677
2a590c3e33
Updated InventoryComponent,TempCharacter
...
Commented InventoryComponent to understand logic easier and removed unused functions from TempCharacter
2022-11-29 12:43:58 +00:00
07e7f8c70f
Added NiagaraSystem for Gun Particle Effect
2022-11-29 01:54:45 +00:00
be0766cf0c
Added EscapeToMenu Component for Escaping to Menu
2022-11-29 00:42:03 +00:00
fdfe4a660c
Bugfix Movement Not being Reenabled on Combat End
2022-11-29 00:34:47 +00:00
1300c99a3f
Added HoldToInitCombat Actor Component for Manual Combat Init
2022-11-29 00:23:15 +00:00
MH261677
120da84a3e
Updated Interaction
...
Hard coded the 6 second wait timer after testing in engine
2022-11-28 23:21:36 +00:00
MH261677
26da472db8
Updated MerchantPrototype
...
Added an 8 second wait timer to the dialouge in engine
2022-11-28 23:20:55 +00:00
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
99f1f0c5af
Added C2Plane in Prototype Level
...
Restarts level when player falls of the map
2022-11-28 22:30:35 +00:00
06492d69d5
Updated TurnBaseCombat for Keyboard Hotkeys
...
Crit Feedback
2022-11-24 02:49:37 +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
c6cba80a07
Bugfix Debug Lines Marked Green on Missed Traces
2022-11-21 22:35:04 +00:00
22c13a8c25
Bugfix Movement Enabled During Combat in TBCv2
2022-11-21 22:34:33 +00:00
6a041e4621
Updated RTCombat for Shooting Accuracy via LineTrace
2022-11-21 20:59:29 +00:00
1751ffd163
Added Main Menu for Test Levels
2022-11-21 12:50:59 +00:00
7184e19dce
Bugfix GunProtoype Handle Subject to Backface Culling
...
Flipped Normals on Handle
2022-11-21 00:15:37 +00:00
