PBM2H22CWE/GARGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PBM2H22CWE:5df8973756639a1220ffece9db3e3cb3295648c3
Branches Tags
PBM2H22CWE:main
..
compare: PBM2H22CWE:main
Branches Tags
PBM2H22CWE:main

43 Commits
5df8973756 ... main

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
Emmylou Unger
2bbc7c8697 Autosafe whatever 2024-07-05 14:53:49 +02:00
Emmylou Unger
d8f0d1ddbc Charakter Animationen 2024-07-05 14:53:22 +02:00
Emmylou Unger
531b9f371e Merge remote-tracking branch 'origin/main' 2024-07-05 12:04:13 +02:00
Emmylou Unger
77f2b25fd1 Arbeit an Animationen 2024-07-05 12:03:41 +02:00
Angeline
50134fae94 Revert "sdfghjk" 
This reverts commit 0536b6e906.
 2024-07-05 12:01:12 +02:00
Angeline
0536b6e906 sdfghjk 2024-07-05 11:55:55 +02:00
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
Emmylou Unger
202805f852 Charakter angefangen 2024-07-05 11:30:32 +02:00
Angeline
5d6bfef789 Map Update 12 2024-07-05 11:16:59 +02:00
Angeline
e04ca2d8ad Map Update 11 2024-07-05 10:05:07 +02:00
NB-PBM2H22CWE\bib
4bf4ee765a Lagerfeuer und Fackeln 2024-07-05 09:17:27 +02:00
Angeline
fde3ab0890 Map Update 10 2024-07-04 23:39:02 +02:00
Angeline
a50e7fd439 Map Update 9 2024-07-04 17:26:35 +02:00
Angeline
fadf9cb44d Map Update 8 2024-07-04 15:19:46 +02:00
Angeline
17e93eaa47 Map Update 7 2024-07-04 11:32:16 +02:00
Angeline
616b8cb792 Map Update 6 2024-07-04 00:20:55 +02:00
Angeline
90eb53eb65 Map Update 5 2024-07-03 23:31:18 +02:00
Angeline
130edb7865 Map Update 4 2024-07-03 22:57:30 +02:00
Angeline
210a8f1760 Map Update 3 2024-07-03 21:58:17 +02:00
Angeline
1eeffdb535 Map Update 2 2024-07-03 20:57:54 +02:00
Emmylou Unger
12799aa6f0 Textur Update 2024-07-03 15:15:48 +02:00
Emmylou Unger
d9c1f6f83d Blueprint Shit 2024-07-03 15:15:02 +02:00
Angeline
9cc46ba829 Corners 2024-07-03 11:19:59 +02:00
Angeline
4dbd42f8f2 Lighting 2024-07-03 11:10:29 +02:00
Angeline
1a7a81f97c Emmy coding problems SOLVED 2024-07-01 13:57:46 +02:00
342 changed files with 88376 additions and 30973 deletions
Expand all files Collapse all files

4
Config/DefaultEngine.ini
View File

@@ -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

BIN
Content/Assets/Cacti1.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Cacti2.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Cacti3.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Cacti4.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Cacti5.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Crystall_Cyrstall_chunks.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Crystall_Podest.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Crystall_wing_bone.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Fackel1.uasset
View File

Binary file not shown.

BIN
Content/Assets/Fackel2.uasset
View File

Binary file not shown.

BIN
Content/Assets/Fackel3.uasset
View File

Binary file not shown.

BIN
Content/Assets/FallenKugel.uasset
View File

Binary file not shown.

BIN
Content/Assets/FeuFeu.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Final_Island.uasset
View File

Binary file not shown.

BIN
Content/Assets/M_Sandstone_basecolor.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/M_Sandstone_normal.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/M_Sandstone_roughness.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Material.uasset
View File

Binary file not shown.

BIN
Content/Assets/Plattform_broken__1_.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Schutt.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Trap.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Vase1.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Vase2.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Vase3.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Vase4.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Vase5.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Vase6.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/VaseInside_MatMain.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/Vase_MatMain.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/cornerPiece.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/pillar_big.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/reling.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/saeule.uasset
View File

Binary file not shown.

BIN
Content/Assets/saeule_destroyed.uasset
View File

Binary file not shown.

BIN
Content/Assets/treppe_Cube.uasset
View File

Binary file not shown.

BIN
Content/Assets/treppe_Cube_001.uasset
View File

Binary file not shown.

BIN
Content/Assets/treppe_Cube_002.uasset
View File

Binary file not shown.

BIN
Content/Assets/vase.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand2.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand3.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand4.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand5.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand6.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand7.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand_destroyed.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/wand_destroyed2.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprint/BP_MovingPlatform.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprint/BP_movingPlato.uasset Normal file
View File

Binary file not shown.

BIN
Content/BlueprintTheo/BP_MovingPlatform.uasset Normal file
View File

Binary file not shown.

BIN
Content/BlueprintTheo/BP_movingPlato.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/BP_BrokenPlattform.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Dance.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Deathbox.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Door.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/BP_GameInstance.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Lever.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Projectile.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Spawner.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/CharacterPhysics.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Materials/grastexture.uasset
View File

Binary file not shown.

BIN
Content/Emmy_Testing.umap
View File

Binary file not shown.

BIN
Content/Emmy_Testing_BuiltData.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Base.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Base_BaseColorMC.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Base_Normal.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Base_Normal_OpenGL.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Base_Roughness.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Base_Roughness2.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_AnimBP.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_Dance.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_Idle.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_Interaction.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_JumpEND.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_JumpFLYING.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_JumpSTART.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_Running.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Anim_rig_Walking.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Dance.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_InteractionMon.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_PhysicsAsset.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Fang_Skeleton.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/MCBakingTest_Low_Base_Normal.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/NormalNew.uasset Normal file
View File

Binary file not shown.

BIN
Content/Fang/Walk_RunBS.uasset Normal file
View File

Binary file not shown.

BIN
Content/Map.umap
View File

Binary file not shown.

BIN
Content/Map_BuiltData.uasset
View File

Binary file not shown.

BIN
Content/Materials/BrokenPlatform.uasset Normal file
View File

Binary file not shown.

BIN
Content/Materials/Cacti_1.uasset Normal file
View File

Binary file not shown.

BIN
Content/Materials/Cacti_2.uasset Normal file
View File

Binary file not shown.

BIN
Content/Materials/Cacti_3.uasset Normal file
View File

Binary file not shown.

BIN
Content/Materials/Cacti_4.uasset Normal file
View File

Binary file not shown.

BIN
Content/Materials/Cacti_5.uasset Normal file
View File

Binary file not shown.

BIN
Content/Materials/Crystal.uasset Normal file
View File

Binary file not shown.

BIN
Content/Materials/Event.uasset
View File

Binary file not shown.

BIN
Content/Materials/Fackeln/coals.uasset
View File

Binary file not shown.

BIN
Content/Materials/Fackeln/flame.uasset
View File

Binary file not shown.

BIN
Content/Materials/Fackeln/holders.uasset
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More