Angeline 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
..
Assets	Map Update idk	2024-07-05 14:54:46 +02:00
Blueprints	Charakter Animationen	2024-07-05 14:53:22 +02:00
Fang	Charakter Animationen	2024-07-05 14:53:22 +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 Update idk	2024-07-05 14:54:46 +02:00
Shader+Effekte	Map Update 5	2024-07-03 23:31:18 +02:00
Textures	Map Update idk	2024-07-05 14:54:46 +02:00
ThirdPersonBP/Blueprints	Charakter Animationen	2024-07-05 14:53:22 +02:00
Emmy_Testing_BuiltData.uasset	Charakter Animationen	2024-07-05 14:53:22 +02:00
Emmy_Testing.umap	Charakter Animationen	2024-07-05 14:53:22 +02:00
Map_BuiltData.uasset	Map Update idk	2024-07-05 14:54:46 +02:00
Map.umap	Map Update idk	2024-07-05 14:54:46 +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