Merge branch 'niveau-3' (5e4aa2cb) · Commits · Alixan / Get Out

Commit 5e4aa2cb authored 2 years ago by

NGUYEN BAO-MINH

Browse files

Merge branch 'niveau-3'

parents b50e8680 dd4c82dc

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Assets/BarProps/Textures/Tables/TallRoundTable/Materials/TallRoundTable_TallRoundTable-material_AlbedoTransparency 4.mat 126 additions, 0 deletions

...undTable_TallRoundTable-material_AlbedoTransparency 4.mat
Assets/BarProps/Textures/Tables/TallRoundTable/Materials/TallRoundTable_TallRoundTable-material_AlbedoTransparency 4.mat.meta 8 additions, 0 deletions

...ble_TallRoundTable-material_AlbedoTransparency 4.mat.meta
Assets/BarProps/Textures/WoodenSeats/WoodenStoolBacked/Materials/WoodenStoolBacked_WoodenStoolBacked_Wood-material_AlbedoTransparency 3.mat 126 additions, 0 deletions

..._WoodenStoolBacked_Wood-material_AlbedoTransparency 3.mat
Assets/BarProps/Textures/WoodenSeats/WoodenStoolBacked/Materials/WoodenStoolBacked_WoodenStoolBacked_Wood-material_AlbedoTransparency 3.mat.meta 8 additions, 0 deletions

...enStoolBacked_Wood-material_AlbedoTransparency 3.mat.meta
Assets/BarProps/Textures/WoodenSeats/WoodenStoolBacked/Materials/WoodenStoolBacked_WoodenStoolBacked_Wood-material_AlbedoTransparency 4.mat 126 additions, 0 deletions

..._WoodenStoolBacked_Wood-material_AlbedoTransparency 4.mat
Assets/BarProps/Textures/WoodenSeats/WoodenStoolBacked/Materials/WoodenStoolBacked_WoodenStoolBacked_Wood-material_AlbedoTransparency 4.mat.meta 8 additions, 0 deletions

...enStoolBacked_Wood-material_AlbedoTransparency 4.mat.meta
Assets/BarProps/Textures/WoodenSeats/WoodenStoolBacked/Materials/WoodenStoolBacked_WoodenStoolBacked_Wood-material_MetallicSmoothness.mat 126 additions, 0 deletions

...ed_WoodenStoolBacked_Wood-material_MetallicSmoothness.mat
Assets/BarProps/Textures/WoodenSeats/WoodenStoolBacked/Materials/WoodenStoolBacked_WoodenStoolBacked_Wood-material_MetallicSmoothness.mat.meta 8 additions, 0 deletions

...odenStoolBacked_Wood-material_MetallicSmoothness.mat.meta
Assets/BarProps/Textures/WoodenSeats/WoodenSwivelStoolBacked/Materials/WoodenSwivelStoolBacked_WoodenSwivelStoolBacked-material_AlbedoTransparency 1.mat 127 additions, 0 deletions

...WoodenSwivelStoolBacked-material_AlbedoTransparency 1.mat
Assets/BarProps/Textures/WoodenSeats/WoodenSwivelStoolBacked/Materials/WoodenSwivelStoolBacked_WoodenSwivelStoolBacked-material_AlbedoTransparency 1.mat.meta 8 additions, 0 deletions

...nSwivelStoolBacked-material_AlbedoTransparency 1.mat.meta
Assets/BarProps/Textures/WoodenSeats/WoodenSwivelStoolBacked/Materials/WoodenSwivelStoolBacked_WoodenSwivelStoolBacked-material_AlbedoTransparency 2.mat 127 additions, 0 deletions

...WoodenSwivelStoolBacked-material_AlbedoTransparency 2.mat
Assets/BarProps/Textures/WoodenSeats/WoodenSwivelStoolBacked/Materials/WoodenSwivelStoolBacked_WoodenSwivelStoolBacked-material_AlbedoTransparency 2.mat.meta 8 additions, 0 deletions

...nSwivelStoolBacked-material_AlbedoTransparency 2.mat.meta
Assets/BarProps/Textures/WoodenSeats/WoodenSwivelStoolBacked/Materials/WoodenSwivelStoolBacked_WoodenSwivelStoolBacked-material_MetallicSmoothness 1.mat 127 additions, 0 deletions

...WoodenSwivelStoolBacked-material_MetallicSmoothness 1.mat
Assets/BarProps/Textures/WoodenSeats/WoodenSwivelStoolBacked/Materials/WoodenSwivelStoolBacked_WoodenSwivelStoolBacked-material_MetallicSmoothness 1.mat.meta 8 additions, 0 deletions

...nSwivelStoolBacked-material_MetallicSmoothness 1.mat.meta
Assets/BathroomPack/Materials/Bathtub.mat 56 additions, 7 deletions

Assets/BathroomPack/Materials/Bathtub.mat
Assets/BathroomPack/Materials/Shelf.mat 61 additions, 7 deletions

Assets/BathroomPack/Materials/Shelf.mat
Assets/BathroomPack/Materials/Sink.mat 61 additions, 7 deletions

Assets/BathroomPack/Materials/Sink.mat
Assets/BathroomPack/Materials/Toilet.mat 61 additions, 7 deletions

Assets/BathroomPack/Materials/Toilet.mat
Assets/FreeBarrowsWagons/Materials/hay 4.mat 126 additions, 0 deletions

Assets/FreeBarrowsWagons/Materials/hay 4.mat
Assets/FreeBarrowsWagons/Materials/hay 4.mat.meta 8 additions, 0 deletions

Assets/FreeBarrowsWagons/Materials/hay 4.mat.meta

with 1314 additions and 28 deletions

Please register or to comment

Admin message

Merge branch 'niveau-3'