Compare commits

base: VIRTUOS_WORLD:107a90be8fca897993c2279f0035c6b540b24b07

Branches Tags

VIRTUOS_WORLD:main

...

compare: VIRTUOS_WORLD:1ce8a31857e65972e4db0d0e634270c268c8224a

Branches Tags

VIRTUOS_WORLD:main

2 commits

107a90be8f ... 1ce8a31857

Author	SHA1	Message	Date
Simeon Wallrath	1ce8a31857	Merge branch 'main' of https://code.virtuos.world/VIRTUOS_WORLD/VIRTUOS_Assets	2024-11-21 21:34:38 +01:00
Simeon Wallrath	3454f3eb4c	Asset Collection and Greyboxing	2024-11-21 21:34:33 +01:00

201 changed files with 353 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Expand all files Collapse all files

BIN

Audio/Soundtrack/WIP/Song_1/Song_1.rpp (Stored with Git LFS)

View file

Binary file not shown.

BIN

Audio/Soundtrack/WIP/Song_3/Song3/Song3_V2.rpp (Stored with Git LFS)

View file

Binary file not shown.

BIN

Audio/Soundtrack/WIP/Song_5/Song5/Song5/Song5V2.rpp (Stored with Git LFS)

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/Bathroom.blend (Stored with Git LFS)

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_body_diff_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_body_metallic_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_body_nor_gl_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_body_opacity_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_body_roughness_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_tape_metallic_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_tape_nor_gl_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_tape_orangeblue_diff_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/cassette_player_tape_roughness_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/celandine_01_alpha_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/celandine_01_diff_1k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/celandine_01_nor_gl_1k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/celandine_01_rough_1k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/potted_plant_01_leaves_alpha_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/potted_plant_01_leaves_diff_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/potted_plant_01_leaves_nor_gl_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/potted_plant_01_leaves_rough_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/potted_plant_01_pot_diff_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/potted_plant_01_pot_nor_gl_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/potted_plant_01_pot_rough_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/street_rat_diff_1k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/street_rat_nor_gl_1k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/street_rat_rough_1k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Bathroom/textures/street_rat_sss_1k.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Cabinets_Drawers/Cabinets_Drawers.blend (Stored with Git LFS)

View file

Binary file not shown.

BIN

Blendfiles/Furniture/Furniture.blend (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/GothicCommode_01_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/GothicCommode_01_metallic_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/GothicCommode_01_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/GothicCommode_01_roughness_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

0

Blendfiles/Cabinets_Drawers/textures/LockerBody_Bake1_PBR_Diffuse.png → Blendfiles/Furniture/textures/LockerBody_Bake1_PBR_Diffuse.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/LockerBody_Bake1_PBR_Metalness.png → Blendfiles/Furniture/textures/LockerBody_Bake1_PBR_Metalness.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/LockerBody_Bake1_PBR_Normal.exr → Blendfiles/Furniture/textures/LockerBody_Bake1_PBR_Normal.exr

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/LockerBody_Bake1_PBR_Roughness.png → Blendfiles/Furniture/textures/LockerBody_Bake1_PBR_Roughness.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/LockerDoor_Bake1_PBR_Diffuse.png → Blendfiles/Furniture/textures/LockerDoor_Bake1_PBR_Diffuse.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/LockerDoor_Bake1_PBR_Metalness.png → Blendfiles/Furniture/textures/LockerDoor_Bake1_PBR_Metalness.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/LockerDoor_Bake1_PBR_Normal.exr → Blendfiles/Furniture/textures/LockerDoor_Bake1_PBR_Normal.exr

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/LockerDoor_Bake1_PBR_Roughness.png → Blendfiles/Furniture/textures/LockerDoor_Bake1_PBR_Roughness.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/MergedBake_Bake1_PBR_Diffuse.png → Blendfiles/Furniture/textures/MergedBake_Bake1_PBR_Diffuse.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/MergedBake_Bake1_PBR_Metalness.png → Blendfiles/Furniture/textures/MergedBake_Bake1_PBR_Metalness.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/MergedBake_Bake1_PBR_Normal.exr → Blendfiles/Furniture/textures/MergedBake_Bake1_PBR_Normal.exr

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/MergedBake_Bake1_PBR_Roughness.png → Blendfiles/Furniture/textures/MergedBake_Bake1_PBR_Roughness.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/Metal024_8K-JPG_Color.jpg → Blendfiles/Furniture/textures/Metal024_8K-JPG_Color.jpg

Unescape Escape View file

BIN

Blendfiles/Furniture/textures/Metal024_8K-JPG_Displacement.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

0

Blendfiles/Cabinets_Drawers/textures/Metal024_8K-JPG_Metalness.jpg → Blendfiles/Furniture/textures/Metal024_8K-JPG_Metalness.jpg

Unescape Escape View file

BIN

Blendfiles/Furniture/textures/Metal024_8K-JPG_NormalGL.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

0

Blendfiles/Cabinets_Drawers/textures/Metal024_8K-JPG_Roughness.jpg → Blendfiles/Furniture/textures/Metal024_8K-JPG_Roughness.jpg

Unescape Escape View file

BIN

Blendfiles/Furniture/textures/Old Desk 03_wire_143224087_BaseColor.1001.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Old Desk 03_wire_143224087_Metallic.1001.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Old Desk 03_wire_143224087_Normal.1001.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Old Desk 03_wire_143224087_Roughness.1001.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Ottoman_01_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Ottoman_01_metallic_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Ottoman_01_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Ottoman_01_roughness_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Shelf_01_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Shelf_01_metallic_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Shelf_01_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Shelf_01_roughness_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Sofa_01_diff_1k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Sofa_01_metallic_1k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Sofa_01_nor_gl_1k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/Sofa_01_roughness_1k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_1_BaseColor.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_1_Metallic.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_1_Normal.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_1_Roughness.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_2_BaseColor.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_2_Metallic.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_2_Normal.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/de_2_Roughness.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/dining_chair_02_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/dining_chair_02_metal_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/dining_chair_02_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/dining_chair_02_rough_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/fine_grained_wood_col_1k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/fine_grained_wood_nor_gl_1k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/fine_grained_wood_rough_1k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

0

Blendfiles/Cabinets_Drawers/textures/guizi_24___Default_BaseColor.1002.png → Blendfiles/Furniture/textures/guizi_24___Default_BaseColor.1002.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/guizi_24___Default_Metallic.1002.png → Blendfiles/Furniture/textures/guizi_24___Default_Metallic.1002.png

Unescape Escape View file

0

Blendfiles/Cabinets_Drawers/textures/guizi_24___Default_Roughness.1002.png → Blendfiles/Furniture/textures/guizi_24___Default_Roughness.1002.png

Unescape Escape View file

BIN

Blendfiles/Furniture/textures/kisspng-stock-photography-pressed-flower-craft-floral-desi-5cfbb0859d8df6.2230661015599985976454.png (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_cabinet_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_cabinet_metal_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_cabinet_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_cabinet_rough_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_chair_01_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_chair_01_metal_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_chair_01_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_chair_01_rough_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_chair_02_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_chair_02_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_chair_02_rough_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_sofa_diff_4k.jpg (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_sofa_nor_gl_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

BIN

Blendfiles/Furniture/textures/painted_wooden_sofa_rough_4k.exr (Stored with Git LFS) Normal file

View file

Binary file not shown.

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