Merge branch 'fx-creation' into dev

Browse Source

# Conflicts:
#	Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset

...

This commit is contained in:

MH261677 2023-04-26 13:09:58 +01:00

parent fde1537dc0 873671db64

commit a845c079a4

10 changed files with 23 additions and 14 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/Objects/Counter/Material.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Levels/Testing/SneakMechanicTesting.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Particles/Break.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Particles/Smoke-Alpha02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Particles/SmokeEmisisonLower.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Particles/SmokeMaterial.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.