Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	Content/Legumix/Player/BP_Play.uasset

...

This commit is contained in:

TjgL 2025-03-10 12:20:03 +01:00

parent b76e0e0b55 45ff3368b1

commit 30b4af16c3

6 changed files with 11 additions and 11 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/Legumix/Levels/LVL_TEST_001.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Levels/Prototyping/MI_Grid_WorldAligned.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Player/BP_Play.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Weapon/Revolver/VFX_MuzzleFlash/NS_MuzzleFlash.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Weapon/Shotgun/VFX/MuzzleFlash/NS_MuzzleFlash.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Weapon/VFX/ProjectileHit/NS_ProjectileHit.uasset (Stored with Git LFS)

Binary file not shown.