Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
AzureAbyss/Content
History
PHILIP White af1813fd9a Merge branch 'merchant-system' into Turn-Base-System-V2 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Merchant/BP_MerchantGameMode.uasset
2022-11-29 15:53:39 +00:00
..
BlueprintAI/AI
Bugfix Movement Enabled During Combat in TBCv2
2022-11-21 22:34:33 +00:00
Blueprints
Merge branch 'merchant-system' into Turn-Base-System-V2
2022-11-29 15:53:39 +00:00
BungeeMan
Added BungeeMan for Temp Enemy
2022-11-14 23:01:06 +00:00
Environment
Added C2Plane in Prototype Level
2022-11-28 22:30:35 +00:00
Images
Updated Inventory System
2022-11-15 03:27:44 +00:00
Levels
Merge branch 'merchant-system' into Turn-Base-System-V2
2022-11-29 15:53:39 +00:00
MainMenu
Added C2Plane in Prototype Level
2022-11-28 22:30:35 +00:00
Materials
Added C2Plane in Prototype Level
2022-11-28 22:30:35 +00:00
Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3
Added C2Plane in Prototype Level
2022-11-28 22:30:35 +00:00
Merchant
Merge branch 'merchant-system' into Turn-Base-System-V2
2022-11-29 15:53:39 +00:00
MSPresets
Added Rock Megascan Temp Mesh
2022-11-17 03:03:32 +00:00