Commit Graph

26 Commits

Author SHA1 Message Date
b6ec0904f2
HMD + netbox fixes 2023-01-26 16:19:28 +01:00
4e640fc16f
netbox prefab 2023-01-26 11:35:31 +01:00
ac1b67140b
netbox optimized 2023-01-26 11:14:01 +01:00
32f53da1f1
some unity metadata 2023-01-23 10:51:12 +01:00
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
7c2b32d452
small laser cutter fixes 2023-01-23 10:44:35 +01:00
Axel Galand
7851343575 merge + added city 2023-01-23 09:17:24 +01:00
400e23adc9
merge remote to laser cutter 2023-01-19 12:18:04 +01:00
947ce85ffb
laser cutter done 2023-01-19 12:04:13 +01:00
e375769bd9 add occlusion maps 2023-01-18 16:52:52 +01:00
Axel Galand
a9084d3389 e 2023-01-18 16:31:04 +01:00
effd267fbc add prises 2023-01-18 16:12:19 +01:00
Axel Galand
60cb93ac06 textures ceiling wall floor 2023-01-16 16:36:04 +01:00
Axel Galand
0b8e2f6f47 "Push tout ce que t'as" 2023-01-16 11:51:31 +01:00
fd3e30e0c0 Fix and enhance some models 2023-01-13 22:21:46 +01:00
7a12ae025a Fix shelf 2023-01-13 13:52:28 +01:00
556ca2259f rgb keyboard 2023-01-13 11:44:29 +01:00
dadb97e2c6
Merge remote-tracking branch 'origin/Assets' into Assets
# Conflicts:
#	Assets/Models/Blender/Indoor_plant_02.blend
#	Assets/Models/Blender/Indoor_plant_02.blend.meta
#	Assets/Models/Blender/laser_cutter.blend.meta
#	Assets/Texture/LaserCutter.meta
#	Assets/Texture/LaserCutter/Body.png.meta
2023-01-12 12:09:52 +01:00
9314ac85b8
indoor plants 2023-01-12 12:07:26 +01:00
Axel Galand
fb5baf5506 added some colliders 2023-01-12 11:33:05 +01:00
Axel Galand
44ae3deb3e Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-12 10:49:42 +01:00
Axel Galand
659860829a added some colliders and models to scene 2023-01-12 10:48:37 +01:00
79b46cbfcb
WIP laser cutter model 2023-01-11 18:43:40 +01:00
bf8e8c1b4b
added glass shelf 2023-01-10 11:41:06 +01:00
e6bef57ac3 Working on table hologram 2023-01-06 13:13:52 +01:00
41065ecea5 Tri 2023-01-06 08:55:48 +01:00