MARCEL HARA 62f8aac468 Merge remote-tracking branch 'origin/Set-Dressing' into dev ...

# Conflicts:
#	Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset
#	Content/Levels/Build.umap

2023-05-11 14:19:49 +01:00

..

_GENERATED

Updated Uv's on Start Area Objects

2023-05-11 00:21:51 +01:00

Animations

Updated Boss Character to Trigger Animations

2023-05-09 04:29:19 +01:00

Assets

Merge remote-tracking branch 'origin/Set-Dressing' into dev

2023-05-11 14:19:49 +01:00

BlueprintAI/AI

Exposed Base Damage for Enemies

2023-05-11 04:12:00 +01:00

Blueprints

Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue

2023-05-11 08:52:30 +01:00

BungeeMan

Added tutorial modular kit for first level

2023-02-27 18:14:51 +00:00

Dialogue

Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue

2023-05-11 08:52:30 +01:00

Environment

Changed the height of the Boss Room

2023-05-11 12:16:18 +01:00

Fonts

Updated Quest System for UI

2023-05-04 05:04:37 +01:00

Images

Updated Both Jellies to Use New Icons

2023-05-11 05:20:58 +01:00

Levels

Merge remote-tracking branch 'origin/Set-Dressing' into dev

2023-05-11 14:19:49 +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

Imported megascans for textures and nature assets for mainmenu

2023-04-30 15:15:27 +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