Commit Graph

15 Commits

Author SHA1 Message Date
4e640fc16f
netbox prefab 2023-01-26 11:35:31 +01:00
Axel Galand
8d43eb2ae8 laser 2023-01-23 11:39:06 +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
25473c4936 Remove oculus 2023-01-17 11:15:30 +01:00
Axel Galand
777b30dbed valve index station prefab 2023-01-11 16:43:50 +01:00
Axel Galand
1871b24529 e 2023-01-11 16:31:49 +01:00
150ba3f8e8 Add Steamvr Package 2023-01-10 13:17:49 +01:00
c7549e453e Added Lamp correctly 2023-01-10 09:27:40 +01:00
1ccc61d157 Reimport Oculus Asset 2023-01-10 08:24:03 +01:00
99ceb83739 Placing assets in scene 2023-01-09 15:42:52 +01:00
7852573190 Fix Oculus 2023-01-09 13:09:13 +01:00
Axel Galand
9e7dba6578 added missing blender files 2023-01-09 12:07:23 +01:00
Axel Galand
f1b53afbcd e 2023-01-09 12:03:36 +01:00
1510cbdcf5 Add Oculus Package 2023-01-09 11:46:20 +01:00