Commit Graph

39 Commits

Author SHA1 Message Date
8cf4d1d52e Built Lighting for Build 2023-01-31 02:45:23 +00:00
75f373e0c4 Updated Beta Level Map for Temp Jelly Assets 2023-01-31 02:15:07 +00:00
a15054656e Merge branch 'dev' into Shaders
# Conflicts:
#	Content/Levels/Top_layer_level.umap
2023-01-31 02:04:48 +00:00
ed0bcc7c76 Updated CombatCharacter to Spawn GunEffect onClick 2023-01-31 01:48:35 +00:00
45374da8bb Updated Combat System to Disengage from Combat 2023-01-31 01:39:42 +00:00
d9584f3b55 Removed Escape To Main Menu 2023-01-31 01:23:28 +00:00
ad91d6eac7 Updated GunEffect Changed Texture from White 2023-01-31 01:02:36 +00:00
0de2753dff Bugfix Clicking Instantly Activates Combat 2023-01-31 00:30:45 +00:00
82c65b3fc4 Fix for Version Conflict 2023-01-17 08:46:31 +00:00
MH261677
43db88c107 Updated BP_GoldCount
Made it so it shows the gold count now that you can set in the BP_TempCharacter
2023-01-14 22:05:20 +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
MARCEL HARA
c7d1394e98 Updated Action Mapping from Right to Left Click 2022-11-29 17:38:39 +00:00
3e93e686dd Updated Main Menu for Merchant 2022-11-29 16:13:30 +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
06492d69d5 Updated TurnBaseCombat for Keyboard Hotkeys
Crit Feedback
2022-11-24 02:49:37 +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
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
e5e24c848a Updated Prototype Environment for Inventory 2022-11-15 03:40:59 +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
bc090192f3 Bugfix Player Inventory for Items Rendering 2022-11-15 00:12:14 +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
f2857b3c57 Updated Combat_UI for Battle Log 2022-11-14 22:30:31 +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
58db9e7459 Updated TurnBaseCombat to Reference HUD Blueprint 2022-11-13 21:41:09 +00:00
bf3b2e3837 Added Combat Test Game Mode Base 2022-11-13 21:41:07 +00:00