Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge branch 'Beta-Level' into merchant-system-v3

Browse Source 
# Conflicts:
#	Content/Blueprints/Combat_UI/Combat_UI.uasset
This commit is contained in:
MH261677 2023-01-17 02:46:42 +00:00
commit cba221ec82
110 changed files with 323 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/DefaultEngine.ini
View File

@ -28,7 +28,7 @@ bOffsetPlayerGamepadIds=False
GameInstanceClass=/Script/Engine.GameInstance GameInstanceClass=/Script/Engine.GameInstance
GameDefaultMap=/Game/MainMenu/MainMenu.MainMenu GameDefaultMap=/Game/MainMenu/MainMenu.MainMenu
ServerDefaultMap=/Engine/Maps/Entry.Entry ServerDefaultMap=/Engine/Maps/Entry.Entry
GlobalDefaultGameMode=/Game/MainMenu/GM_MainMenu.GM_MainMenu_C GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C
GlobalDefaultServerGameMode=None GlobalDefaultServerGameMode=None
[/Script/Engine.CollisionProfile] [/Script/Engine.CollisionProfile]

BIN
Content/Assets/Characters/Placeholder_enemy/Blue_Sheep_Cube_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_004.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_006.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_007.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_008.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_009.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_010.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Characters/Placeholder_enemy/Material_011.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Abyss/Abyss_Cube.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Abyss/Abyss_Cylinder.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Abyss/Rock035_2K_Color.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Abyss/Rock035_2K_NormalDX.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Abyss/Rock035_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Abyss/Rocks.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Blue_rocks.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock035_2K_AmbientOcclusion.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock035_2K_Color.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock035_2K_Displacement.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock035_2K_NormalDX.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock035_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock_tunnels_Curve.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock_tunnels_Open_tunnel.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock_tunnels_Ramp.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock_tunnels_Room.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock_tunnels_Stalegtite.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Caves/Rock_tunnels_Straight.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/Countertop_store.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/Material.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/Material_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/bark_willow_diff_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/bark_willow_disp_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/bark_willow_nor_dx_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/bark_willow_rough_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/beige_wall_001_ao_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/beige_wall_001_diff_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/beige_wall_001_nor_dx_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Counter/beige_wall_001_rough_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Material_1722.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Rope.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Rope_001_normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Rope_001_roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Rope_bridge_Cube_006.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Wood_bark_real.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/Wood_plank.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/bark_willow_ao_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/bark_willow_diff_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/bark_willow_disp_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/bark_willow_nor_dx_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/bark_willow_rough_1k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/wood_planks_grey_diff_2k_ncl1_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/wood_planks_grey_nor_dx_2k_ncl1_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Rope_Bridge/wood_planks_grey_rough_2k_ncl1_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Color_ncl1_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_NormalDX_ncl1_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/DiamondPlate005C_2K_Roughness_ncl1_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/Dirty_metal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/Dirty_metal_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/Glass.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/Metal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Color_ncl1_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/MetalPlates013_2K_NormalDX_ncl1_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/MetalPlates013_2K_Roughness_ncl1_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/Metal_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/NewMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/science_buildings_large_building_door_wall_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Science_buildings/science_buildings_science_outpost_glass_wall.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Shelf/Material.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Shelf/Shelf.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Shelf/wood_planks_grey_ao_2k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Shelf/wood_planks_grey_diff_2k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Shelf/wood_planks_grey_nor_dx_2k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Shelf/wood_planks_grey_rough_2k.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Stalegtite/Material.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Stalegtite/Rock035_2K_AmbientOcclusion.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Stalegtite/Rock035_2K_Color.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Stalegtite/Rock035_2K_Displacement.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Stalegtite/Rock035_2K_NormalDX.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Stalegtite/Rock035_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Stalegtite/Stalegtite.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/Metal_Grid.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Color.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Displacement.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Metalness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_NormalDX.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Opacity.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/PaintedMetal004_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Color.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_NormalDX.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Steel_Rope_and_metal_beam/Rope002_2K_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More