K0RB4K cb917ad376 Merge remote-tracking branch 'origin/Assets' into Assets ... # Conflicts: # Assets/Materials/LaserCutter.meta # Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta # Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta # Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta # Assets/Models/Blender/laser_cutter.mtl.meta # Assets/Models/Blender/laser_cutter.obj.meta # Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta # Assets/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta # Assets/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta		2023-01-23 10:45:24 +01:00
..
Environment	add occlusion maps	2023-01-18 16:52:52 +01:00
IndoorPlant	indoor plants	2023-01-12 12:07:26 +01:00
Keyboard	Fix keyboard and some assets	2023-01-13 18:34:09 +01:00
LaserCutter	Merge remote-tracking branch 'origin/Assets' into Assets	2023-01-23 10:45:24 +01:00
Screen	fix blender imports	2023-01-12 11:56:39 +01:00
Screwdriver	added some colliders and models to scene	2023-01-12 10:48:37 +01:00
Table	Placing assets in scene	2023-01-09 15:42:52 +01:00
TV	Placing assets in scene	2023-01-09 15:42:52 +01:00
Blatt.mat	add occlusion maps	2023-01-18 16:52:52 +01:00
Blatt.mat.meta	add occlusion maps	2023-01-18 16:52:52 +01:00
Chair wheels.physicMaterial	Tri	2023-01-06 08:55:48 +01:00
Chair wheels.physicMaterial.meta	Tri	2023-01-06 08:55:48 +01:00
Environment.meta	Tri	2023-01-06 08:55:48 +01:00
FurnitureSphere.mat	Remove Oculus	2023-01-17 11:14:32 +01:00
FurnitureSphere.mat.meta	Advancing on Catalog	2023-01-17 10:42:17 +01:00
Glass.mat	added glass shelf	2023-01-10 11:41:06 +01:00
Glass.mat.meta	added glass shelf	2023-01-10 11:41:06 +01:00
IndoorPlant.meta	indoor plants	2023-01-12 12:07:26 +01:00
Keyboard.meta	fix blender imports	2023-01-12 11:56:39 +01:00
LaserCutter.meta	small laser cutter fixes	2023-01-23 10:44:35 +01:00
Material 1.mat	add occlusion maps	2023-01-18 16:52:52 +01:00
Material 1.mat.meta	"Push tout ce que t'as"	2023-01-16 11:51:31 +01:00
Material 2.mat	add occlusion maps	2023-01-18 16:52:52 +01:00
Material 2.mat.meta	add occlusion maps	2023-01-18 16:52:52 +01:00
Material.mat	textures ceiling wall floor	2023-01-16 16:36:04 +01:00
Material.mat.meta	Fix and enhance some models	2023-01-13 22:21:46 +01:00
Screen.meta	fix blender imports	2023-01-12 11:56:39 +01:00
Screwdriver.meta	added some colliders and models to scene	2023-01-12 10:48:37 +01:00
Table.meta	Tri	2023-01-06 08:55:48 +01:00
TV.meta	Placing assets in scene	2023-01-09 15:42:52 +01:00
Ultimaker.mat	add occlusion maps	2023-01-18 16:52:52 +01:00
Ultimaker.mat.meta	Tri	2023-01-06 08:55:48 +01:00