Angeline 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
..
Assets	Map Update 11	2024-07-05 10:05:07 +02:00
Blueprints	Map Update 12	2024-07-05 11:16:59 +02:00
Fang	Charakter angefangen	2024-07-05 11:30:32 +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 12	2024-07-05 11:16:59 +02:00
Shader+Effekte	Map Update 5	2024-07-03 23:31:18 +02:00
Textures	Map Update 12	2024-07-05 11:16:59 +02:00
ThirdPersonBP/Blueprints	Charakter angefangen	2024-07-05 11:30:32 +02:00
Emmy_Testing_BuiltData.uasset	Charakter angefangen	2024-07-05 11:30:32 +02:00
Emmy_Testing.umap	Charakter angefangen	2024-07-05 11:30:32 +02:00
Map_BuiltData.uasset	Map Update 12	2024-07-05 11:16:59 +02:00
Map.umap	Map Update 12	2024-07-05 11:16:59 +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