PHILIP White 7e81387247 Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat ... # Conflicts: # Content/Blueprints/Combat_UI/CombatCharacter.uasset		2023-01-31 00:50:59 +00:00
..
Testing	Added Geometry Collection for Destructable Components	2023-01-26 17:54:56 +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
Main.umap	LineTrace works and is detecting objects.	2022-11-11 20:21:44 +00:00
MerchantPrototype.umap	Updated Merchant_UI	2023-01-26 17:41:51 +00:00
Prototype.umap	Implamented Soft wind	2022-12-01 18:02:09 +00:00
Top_layer_level.umap	Bugfix Clicking Instantly Activates Combat	2023-01-31 00:30:45 +00:00