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

..

C2Plane.uasset

Added C2Plane in Prototype Level

2022-11-28 22:30:35 +00:00

CombatTest.umap

Added Prototype Gun to Player Character

2022-11-14 23:05:35 +00:00

EscapeToMenu.uasset

Added EscapeToMenu Component for Escaping to Menu

2022-11-29 00:42:03 +00:00

Main.umap

LineTrace works and is detecting objects.

2022-11-11 20:21:44 +00:00

MerchantPrototype.umap

Created WBP_BuyHealing

2023-01-16 20:42:16 +00:00

Prototype.umap

Updated Action Mapping from Right to Left Click

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

RealTimeCombatSystemTest.umap

Added RealTimeCombat Map, Character & GameModeBase

2022-11-17 04:51:33 +00:00

Top_layer_level.umap

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

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

TurnBaseSystemV2Test.umap

Added Main Menu for Test Levels

2022-11-21 12:50:59 +00:00