Merge remote-tracking branch 'origin/Set-Dressing-2' into dev

Browse Source

...

This commit is contained in:

Philip W 2023-05-13 00:00:31 +01:00

parent 8d096d7e36 f2b64ba183

commit 22c5f8163b

22 changed files with 52 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

Content/Assets/Characters/Boss/M_Boss.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/Elements/Eis/Crystal_lambert1_BaseColor_Mat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Gun/GunMaterialNoDrawOver.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/Objects/MerchantShop/M_Lamp.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/Objects/MerchantShop/M_shopDecoObjects.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/Objects/MerchantShop/M_shopWoodObjects.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/Objects/Rope_Bridge/rope_bridge_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Rope_Bridge/rope_bridge_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Environment/Level_Environment/Adaptions/WorldGridMaterial.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Environment/Level_Environment/Adaptions/boss_room.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Environment/Level_Environment/Adaptions/boss_room_uv_fixed.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Level_Environment/Adaptions/lambert1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Environment/mushrooms/Fat_Mushroom/fat_mushrooms_uved_lambert1_BaseColor_Mat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/mushrooms/Skinny_Mushroom/M_Skinny_mushrooms.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Environment/mushrooms/Wall_Mushroom/wall_mushroom_uved_lambert1_BaseColor_Mat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/Build.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wjwtbb3/T_Mossy_Forest_Boulder_wjwtbb3_8K_Mat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Environment/boss_room_uv_fixed.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

boss_room_uv_fixed.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

boss_room_uv_fixed.mb (Stored with Git LFS) Normal file

View File

Binary file not shown.