Merge remote-tracking branch 'origin/main'

Browse Source

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

...

This commit is contained in:

Angeline Staiger

2024-07-05 14:56:15 +02:00

parent 3f36e0ca39 2bbc7c8697

commit 724fc27522

20 changed files with 26499 additions and 5 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

BIN

Content/Blueprints/BP_BrokenPlattform.uasset

Binary file not shown.

BIN

Content/Blueprints/BP_Dance.uasset Normal file

Binary file not shown.

BIN

Content/Emmy_Testing.umap

Binary file not shown.

BIN

Content/Emmy_Testing_BuiltData.uasset

Binary file not shown.

BIN

Content/Fang/Base.uasset

Binary file not shown.

BIN

Content/Fang/Fang.uasset

Binary file not shown.

BIN

Content/Fang/Fang_AnimBP.uasset

Binary file not shown.

BIN

Content/Fang/Fang_Anim_rig_Running.uasset Normal file

Binary file not shown.

BIN

Content/Fang/Fang_Anim_rig_Walking.uasset Normal file

Binary file not shown.

BIN

Content/Fang/Fang_Dance.uasset Normal file

Binary file not shown.

BIN

Content/ThirdPersonBP/Blueprints/ThirdPersonCharacter.uasset

Binary file not shown.