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

..

HoloLens

Updated TurnBaseCombat to Reference Actors

2022-11-09 21:24:36 +00:00

DefaultEditor.ini

Updated Combat UI for Progress Bars

2022-11-14 00:03:24 +00:00

DefaultEngine.ini

Merge branch 'Beta-Level' into merchant-system-v3

2023-01-17 02:46:42 +00:00

DefaultGame.ini

Updated Project Settings for Build

2022-11-15 03:48:02 +00:00

DefaultInput.ini

Updated Action Mapping from Right to Left Click

2022-11-29 17:38:39 +00:00