Commit Graph

11 Commits

Author SHA1 Message Date
5df8973756 Merge remote-tracking branch 'origin/main'
# 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
2024-07-01 13:42:18 +02:00
5d877f5813 Map Aufbau Anfang 2024-07-01 12:18:25 +02:00
ad9ebd81bd Added Blueprints 2024-06-28 13:12:17 +02:00
42f74a56a2 Added Third Person Character 1 2024-06-26 12:28:45 +02:00
0e14d6e14e Safe Commit 2024-06-21 14:57:01 +02:00
bb0cf1c4d7 Steinkugel 2024-06-21 14:55:52 +02:00
30ca636430 Insel 2024-06-21 14:48:37 +02:00
7b6b9f713c Fackeln 2024-06-21 14:37:24 +02:00
e939b5fb54 Treppe Mesh + Textures 2024-06-21 14:00:09 +02:00
2a6c568fae Base Start und Aufräumen 2024-06-10 12:01:30 +02:00
112397a1dd Island-Prototype drin für Blockout (Insel wird noch flacher!) 2024-06-10 11:46:55 +02:00