Commit Graph

20 Commits

Author SHA1 Message Date
MH261677
cba221ec82 Merge branch 'Beta-Level' into merchant-system-v3
# Conflicts:
#	Content/Blueprints/Combat_UI/Combat_UI.uasset
2023-01-17 02:46:42 +00:00
MARCEL HARA
c7d1394e98 Updated Action Mapping from Right to Left Click 2022-11-29 17:38:39 +00:00
1300c99a3f Added HoldToInitCombat Actor Component for Manual Combat Init 2022-11-29 00:23:15 +00:00
1751ffd163 Added Main Menu for Test Levels 2022-11-21 12:50:59 +00:00
edd39e5528 Updated Project Settings for Build 2022-11-15 03:48:02 +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
329cf183b9 Updated TurnBaseCombat for Button Functionality 2022-11-14 03:05:25 +00:00
19d43413ef Updated Combat UI for Progress Bars 2022-11-14 00:03:24 +00:00
c085aae130 Refactored Variable Naming Conventions to Unreal 2022-11-13 21:41:08 +00:00
MH261677
ca90d5fc6e Working on TraceChannel for merchant hit detect 2022-11-10 16:38:38 +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
bea0e1b735 Updated TurnBaseCombat to Reference Actors
Grabs all actors active within scene
2022-11-09 21:24:36 +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
e928b223c8 Added Thirdperson Starter Content
Added the third person starter content in the game so I can start making the 3rd person to 1st person switch mechanic.
2022-10-24 00:52:12 +01:00
41c3c015a6 Updated Project Configuration
It now reflects our targeted platforms and custom game mode
2022-10-22 16:20:05 +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