Merge remote-tracking branch 'origin/Prototyp' into prototyp-v1/kamera-funktionalitaeten-implementieren

Browse Source

# Conflicts:
#	Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset

...

This commit is contained in:

Jamil Raai 2024-10-13 20:42:37 +02:00

parent d086be9edd 15ad75906f

commit 7ff2ec83ad

227 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

Content/Prototyp/Graphic/Character/Boy001.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Boy001_Boy001_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Boy001_Boy001_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Boy001_Boy001_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Boy001_Boy001_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Geak001.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Geak001_Geak001_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Geak001_Geak001_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Geak001_Geak001_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Geak001_Geak001_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man001.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man001_Man_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man001_Man_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man001_Man_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man001_Man_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man002.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man002_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man002_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man002_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Man002_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Boy001.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Boy001_T-Boy001_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Boy001_T-Boy001_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Boy001_T-Boy001_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Boy001_T-Boy001_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Girl001.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Girl001_T-Girl_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Girl001_T-Girl_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Girl001_T-Girl_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/T-Girl001_T-Girl_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman001.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman001_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman001_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman001_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman001_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman002.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman003.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman004.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman004_Sprite_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman004_Sprite_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman004_Sprite_2.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Character/Woman004_Sprite_3.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Icon/Icon-Bubble_Hearbroken.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Icon/Icon-Bubble_Heart.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Icon/Icon-Bubble_Key.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Icon/Icon-Bubble_Route.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Icon/Icon-Bubble_Work.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Icon/Icon-Bubble_empty.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/AnimSequences/NewPaperZDAnimSequence.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/DefaultSpriteMaterial_Offset.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/DefaultSpriteMaterial_Offset_Inst.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/NewPaperZDAnimationSource.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_f_f.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_f_f_Sprite.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_f_s.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_f_s_Sprite.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_m_f.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_m_f_Flipbook.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_m_f_Sprite.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_m_f_Sprite1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_m_s.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Template/Template_m_s_Sprite.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Fence.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Ground.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/House_front.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/House_front_big.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/House_front_complete.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/House_front_mid.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/House_front_small.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Kachel16x16.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Kachel32x32.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Plants.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Stair.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Tileset64px_stoneground_big_plate.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Tileset_Protoyp01_10.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Tileset_Protoyp01_10_Sprite_0.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Tileset_Protoyp01_10_Sprite_1.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Graphic/Tileset/Tileset_Protoyp01_10_TileSet.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Level/Pixel-Scene_Prototyp.umap Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Material/Mat_Tile.uasset Normal file

View File

Binary file not shown.

BIN

Content/Prototyp/Material/Mat_Tile_Inst.uasset Normal file

View File

Binary file not shown.

BIN

Content/TopDown/Input/Actions/IA_SetDestination_Click.uasset Normal file

View File

Binary file not shown.

BIN

Content/TopDown/Input/Actions/IA_SetDestination_Touch.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/0K/92YVFXFPPAK2AGGLP0JPKU.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/4J/YUJ5KUU44EVF0V2HONBCNS.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/8P/BQEIQ8QN21M3B4UQ99JY7X.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/DN/LXEOORSNSQT09BRF3M8Y30.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/FS/STBGSL8R89CT4C9JICGPAT.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/GI/KNDDNFSESFJBGLSNHY1PCE.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/PC/H637VED991ARB5YPYVZQK4.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/UH/G8ZG4QQUEPA8FTLDU4TUS1.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/0/ZA/AD3C97VKFN85H5M809511S.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/1/3H/Y78NXN7ZF29ODMVQLP7I8K.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/1/4V/C9S3ZD4ES0MV7R7J07D4AT.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/1/68/HYYIQZL54EIK37DOLYGP4F.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/1/P0/EUPIKCHSDZGSJM2KS6HN7N.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/1/RH/6DEOL67LOCPB3155KBPCRV.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/1/UL/6N9G9TVHDC25NSIHOQW0YR.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/1/XI/BQBE5ZPYP1SFT17U50M8C5.uasset Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/Prototyp/Level/Pixel-Scene_Prototyp/2/61/DOP41EYR867U3BRXGPGJL6.uasset Normal file

View File

Binary file not shown.

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