Commit Graph

18 Commits

Author SHA1 Message Date
1a7a81f97c Emmy coding problems SOLVED 2024-07-01 13:57:46 +02:00
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
2b59b35e36 Weiss auch nicht so genau 2024-06-28 10:07:02 +02:00
3bfe439a06 Added Blueprints from other project (hoffe es breakt nichts) 2024-06-26 15:07:04 +02:00
622a021e14 Added Third Person Character 3 2024-06-26 12:30:20 +02:00
6ca2b9c4a9 Added Third Person Character 2 2024-06-26 12:29:18 +02:00
5fdba6f034 Fire Effects 2024-06-26 11:08:07 +02:00
7b6b9f713c Fackeln 2024-06-21 14:37:24 +02:00
e939b5fb54 Treppe Mesh + Textures 2024-06-21 14:00:09 +02:00
d492576459 Blockout Teil 5 - Anbau fertig (mit fixes) + OG 2 (Wasserraum) 2024-06-14 12:50:59 +02:00
fbd070155a Blockout Teil 3 - 1OG fertig + erste Schritte draußen 2024-06-13 10:59:41 +02:00
765df8e947 Blockout Teil 2.2 - Weiterer Aufbau des 1. OG's 2024-06-12 15:13:12 +02:00
4e8d89104a Blockout Teil 2 - Anfang des 1. OG's 2024-06-12 14:32:24 +02:00
112397a1dd Island-Prototype drin für Blockout (Insel wird noch flacher!) 2024-06-10 11:46:55 +02:00
0d79505eb5 Kugel Test 2024-05-13 11:59:38 +02:00
c1512e5ed7 Irgendwas Test dies das 2024-05-13 11:56:01 +02:00