Polishing 2

Polishing
Elevator fixed
2024-07-06 22:44:29 +02:00 · 2024-07-06 21:57:01 +02:00 · 2024-07-06 17:42:37 +02:00 · 2024-07-06 17:01:11 +02:00 · 2024-07-06 16:47:36 +02:00 · 2024-07-06 16:28:26 +02:00
200 changed files with 60335 additions and 42882 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -2,7 +2,7 @@

 [/Script/EngineSettings.GameMapsSettings]
 GlobalDefaultGameMode=/Game/ThirdPersonBP/Blueprints/ThirdPersonGameMode.ThirdPersonGameMode_C
-GameDefaultMap=/Game/Emmy_Testing.Emmy_Testing
-EditorStartupMap=/Game/Emmy_Testing.Emmy_Testing
+GameDefaultMap=/Game/Map.Map
+EditorStartupMap=/Game/Map.Map
 GameInstanceClass=/Game/Blueprints/BP_GameInstance.BP_GameInstance_C

--- a/Content/Assets/Cacti1.uasset
+++ b/Content/Assets/Cacti1.uasset
--- a/Content/Assets/Cacti2.uasset
+++ b/Content/Assets/Cacti2.uasset
--- a/Content/Assets/Cacti3.uasset
+++ b/Content/Assets/Cacti3.uasset
--- a/Content/Assets/Cacti4.uasset
+++ b/Content/Assets/Cacti4.uasset
--- a/Content/Assets/Cacti5.uasset
+++ b/Content/Assets/Cacti5.uasset
--- a/Content/Assets/Final_Island.uasset
+++ b/Content/Assets/Final_Island.uasset
--- a/Content/Assets/M_Sandstone_basecolor.uasset
+++ b/Content/Assets/M_Sandstone_basecolor.uasset
--- a/Content/Assets/M_Sandstone_normal.uasset
+++ b/Content/Assets/M_Sandstone_normal.uasset
--- a/Content/Assets/M_Sandstone_roughness.uasset
+++ b/Content/Assets/M_Sandstone_roughness.uasset
--- a/Content/Assets/Material.uasset
+++ b/Content/Assets/Material.uasset
--- a/Content/Assets/Plattform_broken__1_.uasset
+++ b/Content/Assets/Plattform_broken__1_.uasset
--- a/Content/Assets/Schutt.uasset
+++ b/Content/Assets/Schutt.uasset
--- a/Content/Assets/Trap.uasset
+++ b/Content/Assets/Trap.uasset
--- a/Content/Assets/Vase1.uasset
+++ b/Content/Assets/Vase1.uasset
--- a/Content/Assets/Vase2.uasset
+++ b/Content/Assets/Vase2.uasset
--- a/Content/Assets/Vase3.uasset
+++ b/Content/Assets/Vase3.uasset
--- a/Content/Assets/Vase4.uasset
+++ b/Content/Assets/Vase4.uasset
--- a/Content/Assets/Vase5.uasset
+++ b/Content/Assets/Vase5.uasset
--- a/Content/Assets/Vase6.uasset
+++ b/Content/Assets/Vase6.uasset
--- a/Content/Assets/VaseInside_MatMain.uasset
+++ b/Content/Assets/VaseInside_MatMain.uasset
--- a/Content/Assets/Vase_MatMain.uasset
+++ b/Content/Assets/Vase_MatMain.uasset
--- a/Content/Assets/saeule_destroyed.uasset
+++ b/Content/Assets/saeule_destroyed.uasset
--- a/Content/Assets/treppe_Cube.uasset
+++ b/Content/Assets/treppe_Cube.uasset
--- a/Content/Assets/treppe_Cube_001.uasset
+++ b/Content/Assets/treppe_Cube_001.uasset
--- a/Content/Assets/treppe_Cube_002.uasset
+++ b/Content/Assets/treppe_Cube_002.uasset
--- a/Content/Assets/vase.uasset
+++ b/Content/Assets/vase.uasset
--- a/Content/Assets/wand_destroyed2.uasset
+++ b/Content/Assets/wand_destroyed2.uasset
--- a/Content/Blueprint/BP_MovingPlatform.uasset
+++ b/Content/Blueprint/BP_MovingPlatform.uasset
--- a/Content/Blueprint/BP_movingPlato.uasset
+++ b/Content/Blueprint/BP_movingPlato.uasset
--- a/Content/BlueprintTheo/BP_MovingPlatform.uasset
+++ b/Content/BlueprintTheo/BP_MovingPlatform.uasset
--- a/Content/BlueprintTheo/BP_movingPlato.uasset
+++ b/Content/BlueprintTheo/BP_movingPlato.uasset
--- a/Content/Blueprints/BP_BrokenPlattform.uasset
+++ b/Content/Blueprints/BP_BrokenPlattform.uasset
--- a/Content/Blueprints/BP_Deathbox.uasset
+++ b/Content/Blueprints/BP_Deathbox.uasset
--- a/Content/Blueprints/BP_Door.uasset
+++ b/Content/Blueprints/BP_Door.uasset
--- a/Content/Blueprints/BP_GameInstance.uasset
+++ b/Content/Blueprints/BP_GameInstance.uasset
--- a/Content/Blueprints/BP_Lever.uasset
+++ b/Content/Blueprints/BP_Lever.uasset
--- a/Content/Blueprints/BP_Projectile.uasset
+++ b/Content/Blueprints/BP_Projectile.uasset
--- a/Content/Blueprints/BP_Spawner.uasset
+++ b/Content/Blueprints/BP_Spawner.uasset
--- a/Content/Blueprints/Materials/grastexture.uasset
+++ b/Content/Blueprints/Materials/grastexture.uasset
--- a/Content/Emmy_Testing.umap
+++ b/Content/Emmy_Testing.umap
--- a/Content/Emmy_Testing_BuiltData.uasset
+++ b/Content/Emmy_Testing_BuiltData.uasset
--- a/Content/Fang/Base.uasset
+++ b/Content/Fang/Base.uasset
--- a/Content/Fang/Base_BaseColorMC.uasset
+++ b/Content/Fang/Base_BaseColorMC.uasset
--- a/Content/Fang/Base_Normal.uasset
+++ b/Content/Fang/Base_Normal.uasset
--- a/Content/Fang/Base_Normal_OpenGL.uasset
+++ b/Content/Fang/Base_Normal_OpenGL.uasset
--- a/Content/Fang/Base_Roughness2.uasset
+++ b/Content/Fang/Base_Roughness2.uasset
--- a/Content/Fang/Fang_AnimBP.uasset
+++ b/Content/Fang/Fang_AnimBP.uasset
--- a/Content/Fang/Fang_Anim_rig_Dance.uasset
+++ b/Content/Fang/Fang_Anim_rig_Dance.uasset
--- a/Content/Fang/Fang_Anim_rig_Idle.uasset
+++ b/Content/Fang/Fang_Anim_rig_Idle.uasset
--- a/Content/Fang/Fang_Anim_rig_Interaction.uasset
+++ b/Content/Fang/Fang_Anim_rig_Interaction.uasset
--- a/Content/Fang/Fang_Anim_rig_JumpEND.uasset
+++ b/Content/Fang/Fang_Anim_rig_JumpEND.uasset
--- a/Content/Fang/Fang_Anim_rig_JumpFLYING.uasset
+++ b/Content/Fang/Fang_Anim_rig_JumpFLYING.uasset
--- a/Content/Fang/Fang_Anim_rig_JumpSTART.uasset
+++ b/Content/Fang/Fang_Anim_rig_JumpSTART.uasset
--- a/Content/Fang/Fang_Anim_rig_Running.uasset
+++ b/Content/Fang/Fang_Anim_rig_Running.uasset
--- a/Content/Fang/Fang_Anim_rig_Walking.uasset
+++ b/Content/Fang/Fang_Anim_rig_Walking.uasset
--- a/Content/Fang/Fang_InteractionMon.uasset
+++ b/Content/Fang/Fang_InteractionMon.uasset
--- a/Content/Fang/Fang_PhysicsAsset.uasset
+++ b/Content/Fang/Fang_PhysicsAsset.uasset
--- a/Content/Fang/Fang_Skeleton.uasset
+++ b/Content/Fang/Fang_Skeleton.uasset
--- a/Content/Fang/MCBakingTest_Low_Base_Normal.uasset
+++ b/Content/Fang/MCBakingTest_Low_Base_Normal.uasset
--- a/Content/Fang/NormalNew.uasset
+++ b/Content/Fang/NormalNew.uasset
--- a/Content/Map.umap
+++ b/Content/Map.umap
--- a/Content/Map_BuiltData.uasset
+++ b/Content/Map_BuiltData.uasset
--- a/Content/Materials/BrokenPlatform.uasset
+++ b/Content/Materials/BrokenPlatform.uasset
--- a/Content/Materials/Cacti_1.uasset
+++ b/Content/Materials/Cacti_1.uasset
--- a/Content/Materials/Cacti_2.uasset
+++ b/Content/Materials/Cacti_2.uasset
--- a/Content/Materials/Cacti_3.uasset
+++ b/Content/Materials/Cacti_3.uasset
--- a/Content/Materials/Cacti_4.uasset
+++ b/Content/Materials/Cacti_4.uasset
--- a/Content/Materials/Cacti_5.uasset
+++ b/Content/Materials/Cacti_5.uasset
--- a/Content/Materials/Fackeln/rope.uasset
+++ b/Content/Materials/Fackeln/rope.uasset
--- a/Content/Materials/M_Trap.uasset
+++ b/Content/Materials/M_Trap.uasset
--- a/Content/Materials/Treppe.uasset
+++ b/Content/Materials/Treppe.uasset
--- a/Content/Materials/Tür.uasset
+++ b/Content/Materials/Tür.uasset
--- a/Content/Materials/Vase.uasset
+++ b/Content/Materials/Vase.uasset
--- a/Content/Materials/Wandgemälde.uasset
+++ b/Content/Materials/Wandgemälde.uasset
--- a/Content/Materials/gen3.uasset
+++ b/Content/Materials/gen3.uasset
--- a/Content/Materials/platform_broken.uasset
+++ b/Content/Materials/platform_broken.uasset
--- a/Content/Materials/schlatter.uasset
+++ b/Content/Materials/schlatter.uasset
--- a/Content/Shader+Effekte/Flamethrower.uasset
+++ b/Content/Shader+Effekte/Flamethrower.uasset
--- a/Content/Shader+Effekte/Shader+Effekte/Glitter.uasset
+++ b/Content/Shader+Effekte/Shader+Effekte/Glitter.uasset
--- a/Content/Shader+Effekte/dust.uasset
+++ b/Content/Shader+Effekte/dust.uasset
--- a/Content/Sounds/Dino_sounds/Dino-things_jump.uasset
+++ b/Content/Sounds/Dino_sounds/Dino-things_jump.uasset
--- a/Content/Sounds/Dino_sounds/Dino-things_landing.uasset
+++ b/Content/Sounds/Dino_sounds/Dino-things_landing.uasset
--- a/Content/Sounds/Dino_sounds/Dino-things_noise.uasset
+++ b/Content/Sounds/Dino_sounds/Dino-things_noise.uasset
--- a/Content/Sounds/level_sound/Hintergrund-Musik.uasset
+++ b/Content/Sounds/level_sound/Hintergrund-Musik.uasset
--- a/Content/Sounds/level_sound/Wüsten-Theme.uasset
+++ b/Content/Sounds/level_sound/Wüsten-Theme.uasset
--- a/Content/Sounds/level_sound/Wüsten_Theme.uasset
+++ b/Content/Sounds/level_sound/Wüsten_Theme.uasset
--- a/Content/Sounds/level_sound/level_sound/Bolder.uasset
+++ b/Content/Sounds/level_sound/level_sound/Bolder.uasset
--- a/Content/Sounds/level_sound/level_sound/Bolder_Cue.uasset
+++ b/Content/Sounds/level_sound/level_sound/Bolder_Cue.uasset
--- a/Content/Sounds/level_sound/level_sound/Boldernew.uasset
+++ b/Content/Sounds/level_sound/level_sound/Boldernew.uasset
--- a/Content/Sounds/level_sound/level_sound/Boldernew_Cue.uasset
+++ b/Content/Sounds/level_sound/level_sound/Boldernew_Cue.uasset
--- a/Content/Sounds/level_sound/level_sound/Bonk-Sound-Effect.uasset
+++ b/Content/Sounds/level_sound/level_sound/Bonk-Sound-Effect.uasset
--- a/Content/Sounds/level_sound/level_sound/Kristall.uasset
+++ b/Content/Sounds/level_sound/level_sound/Kristall.uasset
--- a/Content/Sounds/level_sound/level_sound/Kristall_Cue.uasset
+++ b/Content/Sounds/level_sound/level_sound/Kristall_Cue.uasset
--- a/Content/Sounds/level_sound/level_sound/Lagerfeuer.uasset
+++ b/Content/Sounds/level_sound/level_sound/Lagerfeuer.uasset
--- a/Content/Sounds/level_sound/level_sound/Squeaky-Toy-Sound-Effect.uasset
+++ b/Content/Sounds/level_sound/level_sound/Squeaky-Toy-Sound-Effect.uasset
--- a/Content/Sounds/level_sound/level_sound/crumbling_rocks.uasset
+++ b/Content/Sounds/level_sound/level_sound/crumbling_rocks.uasset
--- a/Content/Sounds/level_sound/level_sound/crumbling_rocks_better.uasset
+++ b/Content/Sounds/level_sound/level_sound/crumbling_rocks_better.uasset
--- a/Content/Sounds/level_sound/level_sound/door.uasset
+++ b/Content/Sounds/level_sound/level_sound/door.uasset
--- a/Content/Sounds/level_sound/level_sound/door__new.uasset
+++ b/Content/Sounds/level_sound/level_sound/door__new.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Emmylou Unger	08c38ae4fd	Polishing 2	2024-07-06 22:44:29 +02:00
Angeline	a9a66ccefa	Polishing	2024-07-06 21:57:01 +02:00
Angeline	834b6d865e	Elevator fixed	2024-07-06 17:42:37 +02:00
Emmylou Unger	1e49eff9b5	Balancing, Charakter Collider angepasst	2024-07-06 17:01:11 +02:00
Emmylou Unger	7a05df6289	Gras verteilen	2024-07-06 16:47:36 +02:00
Emmylou Unger	fbb8bc51df	Sound implementieren 2	2024-07-06 16:28:26 +02:00
Emmylou Unger	41df36b96d	Sound implementierung	2024-07-06 15:48:04 +02:00
Angeline	0bf2a53e8b	Final Map Update	2024-07-06 14:39:40 +02:00
Angeline	ff0ba52811	Map Update 16	2024-07-05 22:57:14 +02:00
Angeline	f01ba8fad9	Map Update 15	2024-07-05 21:44:39 +02:00
Emmylou Unger	2910550826	Level Testing	2024-07-05 19:44:47 +02:00
Emmylou Unger	e65afb5f40	Testing	2024-07-05 16:52:37 +02:00
Emmylou Unger	861d1af312	Charakter Sounds	2024-07-05 16:46:07 +02:00
Angeline	67dff91f1b	Map Update 14	2024-07-05 16:10:07 +02:00
NB-PBM2H22CAH\bib	1b18624bbf	Moving Plattforms	2024-07-05 15:31:52 +02:00
Emmylou Unger	83d60d35bd	Send help	2024-07-05 15:26:56 +02:00
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
Angeline	3f36e0ca39	Map Update idk	2024-07-05 14:54:46 +02:00