Merge branch 'Ossie' into dev

Browse Source

...

This commit is contained in:

Philip W 2024-01-27 16:41:59 +00:00

parent a465e4e1a6 14a02812e8

commit b3d3c30528

31 changed files with 91 additions and 4 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

SeagullGame/3d_models/Ossie/Basket.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Coffee/CofeeMachine.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Coffee/CoffeeCup.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Coffee/Costa Money_M_Cofee_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Coffee/Costa Money_M_Coffee_Emissive.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Coffee/Costa Money_M_Coffee_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_Emissive.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Slushie/Slushie Bird_M_Slushie_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Slushie/Slushie Cup.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Slushie/Slushie Machine.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/3d_models/Ossie/Troley.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Basket.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/CofeeMachine.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/CoffeeCup.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Costa_Money_M_Cofee_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Costa_Money_M_Coffee_Emissive.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Costa_Money_M_Coffee_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/M_BlackPlastic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/M_Cofee.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/M_Slushie.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/M_TescoBlue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/M_TroleyGrey.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Slushie_Bird_M_Slushie_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Slushie_Bird_M_Slushie_Emissive.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Slushie_Bird_M_Slushie_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Slushie_Cup.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Slushie_Machine.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/Troley.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

SeagullGame/Content/StarterContent/Particles/P_Ambient_Dust.uasset (Stored with Git LFS)

View File

Binary file not shown.