Merge branch 'SideRoom' into dev

Browse Source

...

This commit is contained in:

ThomasWhitelegg 2024-12-15 18:26:37 +00:00

parent 3d290b3ca1 d528c11f4b

commit 01e5893b70

46 changed files with 133 additions and 10 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/Assets/CorridoorAssets/M_EmissiveMat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/M_PolygonScifi_BubbleShield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/M_SciFiMat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Bld_Security_WatchStation_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Env_Ground_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Icon_Gun.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Books_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Box_Empty_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Box_RobotParts_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Box_Supplies_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Cables_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Cables_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Cables_03.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Medical_Chair_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Medical_Machine_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Medical_Stool_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Medical_Table_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Monitor_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Monitor_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Monitor_03.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Office_Chair_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Paper_Banner_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Paper_Lantern_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Paper_Lantern_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Posters_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Posters_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Posters_03.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Rubbish_Paper_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Rubbish_Paper_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Rubbish_Paper_03.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Rubbish_Paper_04.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Scanner_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_SciFi_Pad_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Security_Camera_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Security_Camera_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Security_Monitor_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Shelf_Wall_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Shield_Bubble_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_StripClub_Chair_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Table_Small_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_Wall_Table_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Prop_table_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Props_StripClub_Table_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/ThomasLabRooms/BP_TeleporterCube.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Levels/PrototypeLevelRework1.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Levels/_GENERATED/ThomasWhitelegg/Box_18AF9D00.uasset (Stored with Git LFS)

View File

Binary file not shown.