Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
419 Commits 1 Branch 15 Tags 5.3 GiB
0146e89f88
Commit Graph

3 Commits

Author SHA1 Message Date
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
Emily Taylor
c4a668c2e9 Added Merchant Shop assets 
Added Merchant shop FBX
 2023-03-06 15:31:55 +00:00
Emily Taylor
26235757f5 Added Merchant Store Assets 
Merchant FBX assets ready to be textured
 2023-03-03 17:32:18 +00:00