Kacper Szelest 0146e89f88 Merge remote-tracking branch 'origin/Merchant' into art-implementation ... # Conflicts: # Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset # Content/Blueprints/Player/BP_MyTempCharacter.uasset # Content/Levels/Build.umap # Content/Levels/Top_layer_level.umap # Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp		2023-03-13 15:35:46 +00: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	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00
Counter	Created top layer level	2023-01-16 17:18:32 +00:00
Crystal	Imported the crystal assets to Unreal	2023-03-06 15:42:52 +00:00
General_Dressing	Imported Assets for Town Dressing into Unreal	2023-03-06 16:53:38 +00: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
MerchantShop	Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine	2023-03-06 16:28:04 +00:00
Red_Jelly	Bugfix Hard Reference for GunEffect not Saving	2023-01-31 03:13:17 +00:00
Rope_Bridge	Added Merchant Shop assets	2023-03-06 15:31:55 +00: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
Stalegtite	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00
Steel_Rope_and_metal_beam	Created top layer level	2023-01-16 17:18:32 +00:00
Tutrorial_Assets	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00