Commit Graph

12 Commits

Author SHA1 Message Date
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