Merge branch 'dev' into Combat

Browse Source

...

This commit is contained in:

Philip W 2023-04-27 23:59:39 +01:00

parent 0f0618ed0a 3a672fb52e

commit 7d87e3d94f

45 changed files with 123 additions and 24 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

ALICIA/NEW/GOAT.mb (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

ALICIA/NEW/WETPAINTFINISHED.mb (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Height.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Metallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_low_lambert1_Roughness.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_1/m_rope1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Height.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Metallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_low_lambert1_Roughness.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_2/m_rope2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_3/Rope3_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Height.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Metallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_3/Rope4_low_lambert1_Roughness.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/Rope_3/m_rope3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Loose_Rope/lambert1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/M_talisman.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/lambert1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/talisman_eye.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/talisman_eye_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/talisman_eye_lambert1_Height.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/talisman_eye_lambert1_Metallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/talisman_eye_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Talisman/talisman_eye_lambert1_Roughness.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_Cube.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_001.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/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Plane.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Dialogue/SM_Merchant_Blueprint.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.