Merge pull request #6 from Games-Academy-Student-Work-23-24/dev

Browse Source

Dev

...

This commit is contained in:

Philip W 2023-11-09 14:33:27 +00:00 committed by GitHub Enterprise

parent 65f7112805 7b923429db

commit 75c1976ec4

142 changed files with 501 additions and 117 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

Assets

Fridge

SM_Fridge.fbx

Textures

1K

T_Fridge1K_C.pngT_Fridge1K_N.pngT_Fridge1K_ORM.png

2K

T_Fridge2K_C.pngT_Fridge2K_N.pngT_Fridge2K_ORM.png

living room

cabinet_01.fbxcarpet_01.fbxchair_01.fbxcoffee_table_01.fbxfireplace_01.fbxside_table_01.fbxsofa_01.fbx

Blockouts

Tutorial Bedroom Blockout.mb

EndlessVendetta/Content/Assets/Objects/Tutorial-Level

Bed01.uassetBedroomTable01_low.uassetDrawers_low.uassetMakeupStand.uassetMirror.uassetSm_Bed01.uassetSm_Desk01.uassetSm_SmallTable01.uassetSm_Wardrobe01.uasset

Textures

Bed01

bed1_low_Bed_BaseColor.uassetbed1_low_Bed_Normal.uassetbed1_low_Bed_OcclusionRoughnessMetallic.uasset

BedroomTable

BedroomTable01_low_BedroomTable_BaseColor.uassetBedroomTable01_low_BedroomTable_Normal.uassetBedroomTable01_low_BedroomTable_OcclusionRoughnessMetallic.uasset

Carpet

Panel_Carpet_BaseColor.uassetPanel_Carpet_Normal.uassetPanel_Carpet_OcclusionRoughnessMetallic.uasset

Drawers01.uasset

Drawers01

Drawers_low_BedsideTable_BaseColor.uassetDrawers_low_BedsideTable_Normal.uassetDrawers_low_BedsideTable_OcclusionRoughnessMetallic.uasset

M_Bed01.uassetM_BedroomTable01.uassetM_Carpet.uassetM_WallMakeupMirror.uasset

WallMakeupMirror

WallMakeupMirror_low_WallMakeupMirror_BaseColor.uassetWallMakeupMirror_low_WallMakeupMirror_Normal.uassetWallMakeupMirror_low_WallMakeupMirror_OcclusionRoughnessMetallic.uasset

lights_textures

ceiling_light_01

ceiling_light_01_Normal.uassetceiling_light_01_OcclusionRoughnessMetallic.uassetceiling_light_01_bl.uassetceiling_light_01_bl_BaseColor.uassetceiling_light_01_or_BaseColor.uassetceiling_light_01_ye_BaseColor.uasset

ceiling_light_02

ceiling_light_02_Normal.uassetceiling_light_02_OcclusionRoughnessMetallic.uassetceiling_light_02_bl.uassetceiling_light_02_bl_BaseColor.uassetceiling_light_02_high_ceiling_light_02_or_BaseColor.uassetceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset

WallPiece01.uassetcabinet_01.uassetcarpet_01.uassetceiling_light_01.uassetceiling_light_02.uassetchair_01.uassetcoffee_table_01.uassetfireplace_01.uassetlamp_01_low.uasset

lights_textures

ceiling_light_01

ceiling_light_01_Normal.uassetceiling_light_01_OcclusionRoughnessMetallic.uassetceiling_light_01_bl.uassetceiling_light_01_bl_BaseColor.uassetceiling_light_01_blue.uassetceiling_light_01_or.uassetceiling_light_01_or_BaseColor.uassetceiling_light_01_orange.uassetceiling_light_01_ye.uassetceiling_light_01_ye_BaseColor.uassetceiling_light_01_yellow.uasset

ceiling_light_02

ceiling_light_02_Normal.uassetceiling_light_02_OcclusionRoughnessMetallic.uassetceiling_light_02__or.uassetceiling_light_02_bl.uassetceiling_light_02_bl_BaseColor.uassetceiling_light_02_blue.uassetceiling_light_02_high_ceiling_light_02_or_BaseColor.uassetceiling_light_02_high_ceiling_light_02_ye_BaseColor.uassetceiling_light_02_orange.uassetceiling_light_02_ye.uassetceiling_light_02_yellow.uasset

lamp_01

lamp_01_Emissive.uassetlamp_01_Normal.uassetlamp_01_OcclusionRoughnessMetallic.uassetlamp_01_blue.uassetlamp_01_low_bl_BaseColor.uassetlamp_01_or_BaseColor.uassetlamp_01_orange.uassetlamp_01_ye_BaseColor.uassetlamp_01_yellow.uasset

wall_light_01

wall_light_01_Emissive.uassetwall_light_01_Normal.uassetwall_light_01_OcclusionRoughnessMetallic.uassetwall_light_01_bl_BaseColor.uasset

Show More

BIN

Assets/Fridge/SM_Fridge.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Fridge/Textures/1K/T_Fridge1K_C.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Fridge/Textures/1K/T_Fridge1K_N.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Fridge/Textures/1K/T_Fridge1K_ORM.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Fridge/Textures/2K/T_Fridge2K_C.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Fridge/Textures/2K/T_Fridge2K_N.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Fridge/Textures/2K/T_Fridge2K_ORM.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/cabinet_01.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/carpet_01.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/chair_01.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/coffee_table_01.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/fireplace_01.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/side_table_01.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/sofa_01.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Blockouts/Tutorial Bedroom Blockout.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bed01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/BedroomTable01_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Drawers_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/MakeupStand.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Mirror.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Bed01/bed1_low_Bed_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Bed01/bed1_low_Bed_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Bed01/bed1_low_Bed_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/BedroomTable/BedroomTable01_low_BedroomTable_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/BedroomTable/BedroomTable01_low_BedroomTable_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/BedroomTable/BedroomTable01_low_BedroomTable_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Carpet/Panel_Carpet_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Carpet/Panel_Carpet_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Carpet/Panel_Carpet_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01/Drawers_low_BedsideTable_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01/Drawers_low_BedsideTable_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01/Drawers_low_BedsideTable_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Bed01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_BedroomTable01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_WallMakeupMirror.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallMakeupMirror/WallMakeupMirror_low_WallMakeupMirror_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallMakeupMirror/WallMakeupMirror_low_WallMakeupMirror_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallMakeupMirror/WallMakeupMirror_low_WallMakeupMirror_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_01/ceiling_light_01_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_01/ceiling_light_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_01/ceiling_light_01_bl.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_01/ceiling_light_01_bl_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_01/ceiling_light_01_or_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_01/ceiling_light_01_ye_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_02/ceiling_light_02_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_02/ceiling_light_02_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_02/ceiling_light_02_bl.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_02/ceiling_light_02_bl_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_or_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/WallPiece01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/cabinet_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/carpet_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/chair_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/coffee_table_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fireplace_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lamp_01_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_blue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_orange.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_yellow.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02__or.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_blue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_or_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_ye.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_yellow.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_Emissive.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_blue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_low_bl_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_or_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_ye_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_yellow.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_Emissive.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_bl_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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