GARGame/Content
Angeline 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
..
Assets Merge remote-tracking branch 'origin/main' 2024-07-01 13:42:18 +02:00
Blueprints Added Blueprints 2024-06-28 13:12:17 +02:00
Geometry/Meshes Added Third Person Character 3 2024-06-26 12:30:20 +02:00
Mannequin Added Blueprints from other project (hoffe es breakt nichts) 2024-06-26 15:07:04 +02:00
Materials Map Aufbau Anfang 2024-07-01 12:18:25 +02:00
Shader+Effekte Added Third Person Character 1 2024-06-26 12:28:45 +02:00
Textures Map Aufbau Anfang 2024-07-01 12:18:25 +02:00
ThirdPersonBP/Blueprints Added Blueprints 2024-06-28 13:12:17 +02:00
Emmy_Testing.umap Added Blueprints 2024-06-28 13:12:17 +02:00
Map_BuiltData.uasset Map Aufbau Anfang 2024-07-01 12:18:25 +02:00
Map.umap Map Aufbau Anfang 2024-07-01 12:18:25 +02:00
Test_BuiltData.uasset Kugel Test 2024-05-13 11:59:38 +02:00
Test.umap Kugel Test 2024-05-13 11:59:38 +02:00