Commit Graph

112 Commits

Author SHA1 Message Date
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
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
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
dabaf24c65 Updated RealTimeCombat Script for Action Points Regen 2022-11-17 04:52:23 +00:00
9780242271 Added RealTimeCombat Map, Character & GameModeBase 2022-11-17 04:51:33 +00:00
d73a0fbd83 Updated RealTimeCombat to Map Functions to Keys 2022-11-17 04:16:44 +00:00
09ec1cb181 Added BP HUD Combat_UI_RT for RealTimeCombat 2022-11-17 04:15:50 +00:00
55607a594a Updated RealTimeCombat to Disable Cursor in Combat 2022-11-17 03:48:56 +00:00
89e9e58453 Added Base Combat Script 2022-11-17 03:47:20 +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
5486fdc8ab Added Base TurnBaseCombat Script 2022-11-17 03:02:58 +00:00
edd39e5528 Updated Project Settings for Build 2022-11-15 03:48:02 +00:00
2977b84cfc Merge pull request #3 from Games-Academy-Student-Work-22-23/dev
Merged Inventory System with the Turned Based Combat System
2022-11-15 03:43:01 +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
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