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	Hub area	2023-01-23 17:09:49 +00:00
Assets	Merge branch 'dev' into ui-art-replacement	2023-02-28 15:26:27 +00:00
BlueprintAI/AI	Merge branch 'dev' into Turn-Based-Combat	2023-02-28 15:29:35 +00:00
Blueprints	Merge branch 'dev' into Turn-Based-Combat	2023-02-28 15:29:35 +00:00
BungeeMan	Added tutorial modular kit for first level	2023-02-27 18:14:51 +00:00
Dialogue	Merge branch 'dev' into Turn-Based-Combat	2023-02-28 15:29:35 +00:00
Environment	Implemented modular kit for tutorial level	2023-02-28 11:43:42 +00:00
Fonts	Added Temp Status Icons and Font for Status Testing	2023-02-23 03:02:49 +00:00
Images	Added Temp Status Icons and Font for Status Testing	2023-02-23 03:02:49 +00:00
Levels	Merge branch 'dev' into Turn-Based-Combat	2023-02-28 15:29:35 +00:00
MainMenu	Updated Action Mapping from Right to Left Click	2022-11-29 17:38:39 +00:00
Materials	Bugfix Platform Too High to Get Across	2023-01-31 03:29:35 +00:00
Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3	Added place holder enemy	2023-01-03 14:38:26 +00:00
Merchant	Updated BP_ShopSelector	2023-01-15 16:14:03 +00:00
MSPresets	Added Rock Megascan Temp Mesh	2022-11-17 03:03:32 +00:00
Music	Implamented Soft wind	2022-12-01 18:02:09 +00:00
Particles	Added Breakable Walls BP	2023-02-01 23:37:17 +00:00