Early Merge of Level Design into Main #33

Merged

mhampel1 merged 3 commits from level-design into main 2023-11-28 01:59:40 +01:00

Conversation 0 Commits 3 Files Changed 49 +143 -11

49 changed files with 143 additions and 11 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 Show outdated comments

BIN

Content/3DModels/Hallway/4WaySplitHallway_Door.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/4WaySplitHallway_HallwayEnding_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/4WaySplitHallway_Light.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/4WaySplitHallway_Light_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/4WaySplitHallway_Split.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Dirty_Concrete.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Dirty_white_tiles.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Gray_white_plastic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Material_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Material_006.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Material_009.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Material_010.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Material_011.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Material_012.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Old_white_plastic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Opaline_Paper.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Polystyrene_Foam.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Raw_Aluminium.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Raw_Aluminium_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Raw_Aluminium_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Raw_Aluminium_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/StatonHallway_Cube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/StatonHallway_Cube_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/StatonHallway_Cube_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/StatonHallway_Cube_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/StatonHallway_HallwayEnding.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/StatonHallway_Light.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Straight_Cube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Straight_Cube_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Straight_Cube_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Straight_Cube_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Straight_HallwayEnding.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Straight_Light.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/Straight_Light_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Hallway/White_Wall-Freepoly_org.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Weapons/Bullet/Bullet.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/3DModels/Weapons/GunLight.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Weapons/LowPolyScifiPistol.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Helmet/Helmet_Solo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Helmet/SimpleGlass.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/TestingLevel.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Materials/Emissive.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Materials/EmissiveRed.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Wood_Pine.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.