Merge art Appartment branch into art Miami branch

Browse Source

...

This commit is contained in:

Louis Horne 2024-05-01 01:30:40 +01:00

parent cc9d590cfc

commit 263caaffad

130 changed files with 388 additions and 1 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

Assets/Assault_Riffle/Assault_Riffle_Low.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Texture/Dinning_Bowl_Low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Texture/Dinning_Bowl_Low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Texture/Dinning_Bowl_Low_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Chair_Legs_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Chair_Legs_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Chair_Legs_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Plastic_Chair_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Plastic_Chair_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Plastic_Chair_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Seat_Padding_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Seat_Padding_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Seat_Padding_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Dinning_Chair_Legs.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Dinning_Chair_Seat.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Dinning_Chair_back.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)

Binary file not shown.

BIN

James WARD Art/Environment/House level plan pitch - First Floor2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Environment/House level plan pitch - Ground Floor1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Environment/Mock Up House - Factory2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Environment/Mock up House - Factory.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun Sketches 1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun Sketches 2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun Sketches 3.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun Sketches 4.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun Sketches 5.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun Sketches Material reference.pdf (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun sketches 6.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Gun sketches 7.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/Pistol, shotgun and assualt rifle concept.pdf (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/new gun concepts 1.pdf (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/possible attachments for pistol 1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Gun Concepts/sniper riple concept.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/CORP SOCIALISM poster 1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/CORP SOCIALISM poster 2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/CORPO LOGO no lettering.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/KOMETDECAL1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/Portabletreehabwallart.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/Space biker gang 1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/Space biker gang 2 decals.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/TORIODECAL.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/VLASTDECAL1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/VLASTDECAL2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/VLASTDECAL3.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/Warning signs1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/Warning signs2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/Warning signs3.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/DECALS/anti fish grav.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Factory corp logo1.pdf (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Factory posters 1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Factory posters 1.pdf (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/KOMET poster1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/KOMET poster2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/KOMET poster3.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Postersbundle1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Postersbundle2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Postersbundle3.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Postersbundle4.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/Postersbundle5.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN

James WARD Art/Posters/SPACESHIP1.jpg (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