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
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
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
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
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
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
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
ba2b6b599c
Merge branch 'dev' into merchant-system
2022-11-18 19:20:20 +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
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
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
9780242271
Added RealTimeCombat Map, Character & GameModeBase
2022-11-17 04:51:33 +00:00
09ec1cb181
Added BP HUD Combat_UI_RT for RealTimeCombat
2022-11-17 04:15:50 +00:00
0b18bcc5c9
Updated CombatCharacter and AI for Tagging
2022-11-17 03:42:35 +00:00
57e8b76e89
Added Chase Blueprint AI
2022-11-17 03:39:12 +00:00
e6fa31ef04
Added TurnBaseSystemV2 Test Level
2022-11-17 03:03:54 +00:00
9a2835f54c
Added Rock Megascan Temp Mesh
2022-11-17 03:03:32 +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
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
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
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
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
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
3b627518ca
Updated Blueprint Combat UI for Prototype Buttons
2022-11-14 03:04:11 +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
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
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
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
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
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
d655109a82
Cleaned Unreal Project
...
Deleted the starter content and made Main the default level
2022-10-18 10:53:22 +01:00
84a326be22
Added Blank Unreal 5 Project
...
In c++ mode
2022-10-18 10:10:40 +01:00
