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

..

Abyss

Added new tunnels

2023-01-16 16:16:54 +00:00

Blue_Jelly

Bugfix Hard Reference for GunEffect not Saving

2023-01-31 03:13:17 +00:00

Caves

Updated Uv's on Start Area Objects

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

Counter

Updated Gun Effects to add smoke and sparks

2023-04-26 12:12:50 +01:00

Crystal

Updated CrystalMaterial for mainmenu crystals

2023-04-30 15:15:39 +01:00

General_Dressing

Added Statue and Boss Character

2023-05-04 16:13:51 +01:00

Level_1_assets

Updated build level

2023-03-06 16:08:35 +00:00

Level_1_map

Added Merchant Shop assets

2023-03-06 15:31:55 +00:00

Loose_Rope

Rope and talisman and textures

2023-04-27 18:00:30 +01:00

MerchantShop

Imported Shop textures

2023-05-11 11:42:41 +01:00

pendant

Applied Pendant Texture

2023-05-08 22:44:19 +01:00

Red_Jelly

Bugfix Hard Reference for GunEffect not Saving

2023-01-31 03:13:17 +00:00

Rope_Bridge

Updated Map to Remove Rope on Model as Impossible to Align

2023-04-30 20:11:16 +01:00

Science_buildings

Created top layer level

2023-01-16 17:18:32 +00:00

Shelf

Created top layer level

2023-01-16 17:18:32 +00:00

Sign

Updated all lighting to whole scene

2023-03-29 17:03:00 +01:00

Stalegtite

Updated Uv's on Start Area Objects

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

Steel_Rope_and_metal_beam

Created top layer level

2023-01-16 17:18:32 +00:00

Talisman

Rope and talisman and textures

2023-04-27 18:00:30 +01:00

Tutrorial_Assets

Bugfix Camera Clipping and Render Depth On Book & Gun

2023-04-27 03:47:24 +01:00

Updated_level_map

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

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