VR-Sexe/Phillipes_Fablab
5
0
Fork 0
generated from VR-Sexe/Unity3DTemplate
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dadb97e2c6
Phillipes_Fablab/Assets
History
K0RB4K 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
..
KeyboardAdjustableColors fix blender imports 2023-01-12 11:56:39 +01:00
Materials Merge remote-tracking branch 'origin/Assets' into Assets 2023-01-12 12:09:52 +01:00
Models Merge remote-tracking branch 'origin/Assets' into Assets 2023-01-12 12:09:52 +01:00
Oculus fix blender imports 2023-01-12 11:56:39 +01:00
Plugins fix blender imports 2023-01-12 11:56:39 +01:00
Poses Fix blender 2023-01-12 12:06:12 +01:00
QuickOutline Grab working 2023-01-10 17:09:03 +01:00
Resources Add Oculus Package 2023-01-09 11:46:20 +01:00
Scenes Fix blender 2023-01-12 12:06:12 +01:00
Scripts Fixing MovableFurniture 2023-01-11 15:35:48 +01:00
SteamVR Grab working 2023-01-10 17:09:03 +01:00
SteamVR_Input Add Steamvr Package 2023-01-10 13:17:49 +01:00
SteamVR_Resources Add Steamvr Package 2023-01-10 13:17:49 +01:00
StreamingAssets Add Steamvr Package 2023-01-10 13:17:49 +01:00
Texture Merge remote-tracking branch 'origin/Assets' into Assets 2023-01-12 12:09:52 +01:00
XR valve index station prefab 2023-01-11 16:43:50 +01:00
InputSystem.inputsettings.asset Grab working 2023-01-10 17:09:03 +01:00
InputSystem.inputsettings.asset.meta Grab working 2023-01-10 17:09:03 +01:00
KeyboardAdjustableColors.meta add models 2023-01-11 16:50:43 +01:00
Materials.meta Add old fablab assets 2023-01-06 08:44:59 +01:00
Models.meta Add old fablab assets 2023-01-06 08:44:59 +01:00
Oculus.meta Add Oculus Package 2023-01-09 11:46:20 +01:00
Plugins.meta Add Blender import rotation fix 2023-01-05 11:54:38 +01:00
Poses.meta Fix blender 2023-01-12 12:06:12 +01:00
QuickOutline.meta Grab working 2023-01-10 17:09:03 +01:00
Resources.meta e 2023-01-09 12:03:36 +01:00
Scenes.meta Initial commit 2023-01-05 11:28:37 +01:00
Scripts.meta Tri 2023-01-06 08:55:48 +01:00
SteamVR_Input.meta Add Steamvr Package 2023-01-10 13:17:49 +01:00
SteamVR_Resources.meta Add Steamvr Package 2023-01-10 13:17:49 +01:00
SteamVR.meta Add Steamvr Package 2023-01-10 13:17:49 +01:00
StreamingAssets.meta Add Steamvr Package 2023-01-10 13:17:49 +01:00
Texture.meta Tri 2023-01-06 08:55:48 +01:00
UniversalRenderPipelineGlobalSettings.asset Grab working 2023-01-10 17:09:03 +01:00
UniversalRenderPipelineGlobalSettings.asset.meta Grab working 2023-01-10 17:09:03 +01:00
XR.meta e 2023-01-09 12:03:36 +01:00