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
..
Mock HMD Build Settings.asset	Placing assets in scene	2023-01-09 15:42:52 +01:00
Mock HMD Build Settings.asset.meta	Placing assets in scene	2023-01-09 15:42:52 +01:00
Oculus Settings.asset	Add Oculus Package	2023-01-09 11:46:20 +01:00
Oculus Settings.asset.meta	Add Oculus Package	2023-01-09 11:46:20 +01:00
Open VR Settings.asset	small laser cutter fixes	2023-01-23 10:44:35 +01:00
Open VR Settings.asset.meta	Add Steamvr Package	2023-01-10 13:17:49 +01:00
OpenXR Editor Settings.asset	Add Oculus Package	2023-01-09 11:46:20 +01:00
OpenXR Editor Settings.asset.meta	Add Oculus Package	2023-01-09 11:46:20 +01:00
OpenXR Package Settings.asset	Remove oculus	2023-01-17 11:15:30 +01:00
OpenXR Package Settings.asset.meta	Add Oculus Package	2023-01-09 11:46:20 +01:00