Commit Graph

53 Commits

Author SHA1 Message Date
83d60d35bd Send help 2024-07-05 15:26:56 +02:00
724fc27522 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/Autosaves/PackageRestoreData.json
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log
2024-07-05 14:56:15 +02:00
3f36e0ca39 Map Update idk 2024-07-05 14:54:46 +02:00
2bbc7c8697 Autosafe whatever 2024-07-05 14:53:49 +02:00
d8f0d1ddbc Charakter Animationen 2024-07-05 14:53:22 +02:00
77f2b25fd1 Arbeit an Animationen 2024-07-05 12:03:41 +02:00
4773d1e9d2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log
2024-07-05 11:32:10 +02:00
202805f852 Charakter angefangen 2024-07-05 11:30:32 +02:00
5d6bfef789 Map Update 12 2024-07-05 11:16:59 +02:00
e04ca2d8ad Map Update 11 2024-07-05 10:05:07 +02:00
4bf4ee765a Lagerfeuer und Fackeln 2024-07-05 09:17:27 +02:00
fde3ab0890 Map Update 10 2024-07-04 23:39:02 +02:00
a50e7fd439 Map Update 9 2024-07-04 17:26:35 +02:00
fadf9cb44d Map Update 8 2024-07-04 15:19:46 +02:00
17e93eaa47 Map Update 7 2024-07-04 11:32:16 +02:00
616b8cb792 Map Update 6 2024-07-04 00:20:55 +02:00
90eb53eb65 Map Update 5 2024-07-03 23:31:18 +02:00
130edb7865 Map Update 4 2024-07-03 22:57:30 +02:00
210a8f1760 Map Update 3 2024-07-03 21:58:17 +02:00
1eeffdb535 Map Update 2 2024-07-03 20:57:54 +02:00
12799aa6f0 Textur Update 2024-07-03 15:15:48 +02:00
d9c1f6f83d Blueprint Shit 2024-07-03 15:15:02 +02:00
9cc46ba829 Corners 2024-07-03 11:19:59 +02:00
4dbd42f8f2 Lighting 2024-07-03 11:10:29 +02:00
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
42f74a56a2 Added Third Person Character 1 2024-06-26 12:28:45 +02:00
0e5bfd13e7 Material bearbeitet 2024-06-26 11:12:37 +02:00
5fdba6f034 Fire Effects 2024-06-26 11:08:07 +02:00
0e14d6e14e Safe Commit 2024-06-21 14:57:01 +02:00
bb0cf1c4d7 Steinkugel 2024-06-21 14:55:52 +02:00
6ee3645993 Insel Fix 2024-06-21 14:50:39 +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
7c93dad061 Sicherheits Commit 2024-06-14 14:55:54 +02:00
f7888d8d78 Blockout Teil 6 - Aufbau Fertig (inkl. Checkpoints) und Ordnung wiederhergestellt 2024-06-14 14:54:58 +02:00
d492576459 Blockout Teil 5 - Anbau fertig (mit fixes) + OG 2 (Wasserraum) 2024-06-14 12:50:59 +02:00
7ee736e9af Blockout Teil 4 - Anbau für OG2 2024-06-13 12:04:44 +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
bf2413d1f7 Blockout Teil 1 (EG + Eingang (ohne Treppen) 2024-06-10 13:01:18 +02:00
2a6c568fae Base Start und Aufräumen 2024-06-10 12:01:30 +02:00