Commit Graph

15 Commits

Author SHA1 Message Date
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
Axel Galand
fa97d2f2ca add models 2023-01-11 16:50:43 +01:00
Axel Galand
777b30dbed valve index station prefab 2023-01-11 16:43:50 +01:00
9f21be7bbc
Merge remote-tracking branch 'origin/Scripting' into Assets
# Conflicts:
#	Assets/Scenes/FabLab/FabLab.unity
2023-01-11 16:16:01 +01:00
8e129d8f6c Grab working 2023-01-10 17:09:03 +01:00
470a112766
added network bay asset + put in scene 2023-01-10 16:26:20 +01:00
bf8e8c1b4b
added glass shelf 2023-01-10 11:41:06 +01:00
f8df52dfd6 Adding Lamp 2023-01-09 16:54:09 +01:00
Axel Galand
9e7dba6578 added missing blender files 2023-01-09 12:07:23 +01:00
Axel Galand
43577d2817 added few assets + placed TV 2023-01-09 11:49:51 +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