Merge remote-tracking branch 'origin/main'

Browse Source

# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/AutoScreenshot.png
#	Saved/Config/CrashReportClient/UE4CC-Windows-26C0574148A80F1241BAC28EB3C6CB42/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-85ACC2DF4F5ECBEB010EDC890FABFAB7/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-884F02AE422160193B63EB9556766C5A/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-AB1C1390466C882DFD90D08C57659F53/CrashReportClient.ini
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log
#	Saved/SaveGames/1.sav

...

This commit is contained in:

Angeline Staiger

2024-07-01 13:42:18 +02:00

parent 5d877f5813 ad9ebd81bd

commit 5df8973756

25 changed files with 6914 additions and 4798 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/Assets/door_Cube.uasset Normal file

Binary file not shown.

BIN

Content/Assets/door_Cube_001.uasset Normal file

Binary file not shown.

BIN

Content/Assets/schalter_Cube_001.uasset Normal file

Binary file not shown.

BIN

Content/Assets/schalter_Cube_002.uasset Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_BrokenPlattform.uasset Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_Door.uasset Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_Lever.uasset Normal file

Binary file not shown.

BIN

Content/Blueprints/BP_Spawner.uasset

Binary file not shown.

BIN

Content/Emmy_Testing.umap

Binary file not shown.

BIN

Content/ThirdPersonBP/Blueprints/ThirdPersonCharacter.uasset

Binary file not shown.