Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
AzureAbyss/Content
History
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
..
_GENERATED
Moddeled hub level blockout
2023-02-27 15:31:06 +00:00
Assets
Merge remote-tracking branch 'origin/Merchant' into art-implementation
2023-03-13 15:35:46 +00:00
BlueprintAI/AI
Added Merchant Shop assets
2023-03-06 15:31:55 +00:00
Blueprints
Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine
2023-03-06 16:28:04 +00:00
BungeeMan
Added tutorial modular kit for first level
2023-02-27 18:14:51 +00:00
Dialogue
Merge branch 'dev' into Turn-Based-Combat
2023-02-28 15:29:35 +00:00
Environment
Implemented modular kit for tutorial level
2023-02-28 11:43:42 +00:00
Fonts
Added Temp Status Icons and Font for Status Testing
2023-02-23 03:02:49 +00:00
Images
Added Temp Status Icons and Font for Status Testing
2023-02-23 03:02:49 +00:00
Levels
Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine
2023-03-06 16:28:04 +00:00
MainMenu
Updated Action Mapping from Right to Left Click
2022-11-29 17:38:39 +00:00
Materials
Added Merchant Shop assets
2023-03-06 15:31:55 +00:00
Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3
Added place holder enemy
2023-01-03 14:38:26 +00:00
Merchant
Updated BP_ShopSelector
2023-01-15 16:14:03 +00:00
MSPresets
Added Rock Megascan Temp Mesh
2022-11-17 03:03:32 +00:00
Music
Added Merchant Shop assets
2023-03-06 15:31:55 +00:00
Particles
Added Breakable Walls BP
2023-02-01 23:37:17 +00:00