MarcelHara e3d3061843 Merge branch 'dev' into inventory-ui-overhaul ... # Conflicts: # Content/Assets/Characters/Merchant/AMerchant.uasset # Content/Blueprints/Combat_UI/CombatCharacter.uasset # Content/Blueprints/Items/BP_BuffJelly.uasset # Content/Blueprints/Items/BP_HealingJelly.uasset # Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset # Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset # Content/Blueprints/Quests/Quest_SistersPendant.uasset # Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset # Content/Dialogue/SM_Merchant_Blueprint.uasset		2023-05-13 17:15:48 +01:00
..
_GENERATED	Updated Uv's on Start Area Objects	2023-05-11 00:21:51 +01:00
Animations	Bugfix Boss Idle Animation Not Looping	2023-05-12 17:06:21 +01:00
Assets	Merge branch 'dev' into inventory-ui-overhaul	2023-05-13 17:15:48 +01:00
BlueprintAI/AI	Updated Boss for Dialogue and End Game Dialogue	2023-05-13 16:25:07 +01:00
Blueprints	Merge branch 'dev' into inventory-ui-overhaul	2023-05-13 17:15:48 +01:00
BungeeMan	Added tutorial modular kit for first level	2023-02-27 18:14:51 +00:00
Dialogue	Merge branch 'dev' into inventory-ui-overhaul	2023-05-13 17:15:48 +01:00
Environment	Built Lighting for Build Level	2023-05-13 01:08:06 +01:00
Fonts	Updated Quest System for UI	2023-05-04 05:04:37 +01:00
Images	Updated UI for New Designs	2023-05-13 01:02:47 +01:00
Levels	Bugfix Collisions & UV's in Maze	2023-05-13 16:42:26 +01:00
MainMenu	Changed UI to 2D to make it look 3D on the book	2023-04-27 17:18:46 +01:00
Materials	Improved Rock Texture in Unreal	2023-04-20 16:29:56 +01:00
Megascans	Built Lighting for Build Level	2023-05-13 01:08:06 +01:00
Merchant	Updated BP_ShopSelector	2023-01-15 16:14:03 +00:00
MSPresets	Material changes to mainmenu assets	2023-04-30 15:15:11 +01:00
Music	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00
Particles	Updated SmokeParticles to breaking walls	2023-04-27 11:57:03 +01:00
ScienceBuilding	Cooked New Materials for Build	2023-03-14 04:47:53 +00:00