Merge remote-tracking branch 'origin/main'

Browse Source

# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log

...

This commit is contained in:

Angeline Staiger

2024-07-05 11:32:10 +02:00

parent 5d6bfef789 202805f852

commit 4773d1e9d2

26 changed files with 15729 additions and 16 deletions

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

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

Saved/Autosaves/Game/Blueprints/Materials/grastexture_Auto3.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Emmy_Testing_Auto3.umap

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Base_Roughness2_Auto3.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_AnimBP_Auto4.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_AnimBP_Auto5.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_Auto1.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_Auto2.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_PhysicsAsset_Auto1.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_PhysicsAsset_Auto2.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_Skeleton_Auto1.uasset

BIN

Binary file not shown.

Saved/Autosaves/Game/Fang/Fang_Skeleton_Auto2.uasset

BIN

Binary file not shown.

Saved/Autosaves/PackageRestoreData.json

BIN

Binary file not shown.