Merge branch 'SideRoom' into Enemies

Browse Source

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

...

This commit is contained in:

Rafal 2024-12-15 16:30:09 +00:00

parent b67b9bf260 b69aa2f1de

commit 3d290b3ca1

40 changed files with 119 additions and 2 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_SciFiMat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_05.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) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_4CA95822.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_881E35A2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_B1DF9375.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/_GENERATED/ThomasWhitelegg/Path_934A14D3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.