PHILIP White e8c20e2d67 Merge branch 'dev' into Turn-Based-Combat ...

# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
#	Content/Dialogue/NPCTest.uasset
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp

2023-02-28 15:29:35 +00:00

..

_GENERATED/tr258492

Cleaning Level

2023-02-09 17:02:47 +00:00

Testing

Merge branch 'dev' into Turn-Based-Combat

2023-02-28 15:29:35 +00:00

C2Plane.uasset

Added C2Plane in Prototype Level

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

EscapeToMenu.uasset

Added EscapeToMenu Component for Escaping to Menu

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

Hub_2.umap

Updated Level-Design. Hub Town 'finished'

2023-01-30 17:29:28 +00:00

Hub.umap

Cleaning Level

2023-02-09 17:02:47 +00:00

Level_1.umap

Added file level

2023-02-20 14:47:52 +00:00

Main.umap

LineTrace works and is detecting objects.

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

MerchantPrototype.umap

Updated EatableItems for AmmoFunctionality

2023-02-07 00:11:00 +00:00

Prototype.umap

Implamented Soft wind

2022-12-01 18:02:09 +00:00

Top_layer_level.umap

Implemented modular kit for tutorial level

2023-02-28 11:43:42 +00:00

Tutorial.umap

Implemented modular kit for tutorial level

2023-02-28 11:43:42 +00:00