Merge remote-tracking branch 'origin/feature/menu'
# Conflicts: # Assets/ExampleAssets/Materials/Grid.mat # Assets/Materials.meta # Assets/Scenes/SampleScene.unity # Assets/Scenes/SampleSceneSettings.lighting.meta # Assets/Scripts.meta # Assets/SteamVR_Input.meta # Assets/SteamVR_Input/ActionSetClasses.meta # Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_buggy.cs.meta # Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs # Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs.meta # Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_mixedreality.cs.meta # Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_platformer.cs.meta # Assets/SteamVR_Input/SteamVR_Actions.asmdef.meta # Assets/SteamVR_Input/SteamVR_Input_ActionSets.cs # Assets/SteamVR_Input/SteamVR_Input_ActionSets.cs.meta # Assets/SteamVR_Input/SteamVR_Input_Actions.cs # Assets/SteamVR_Input/SteamVR_Input_Actions.cs.meta # Assets/SteamVR_Input/SteamVR_Input_Initialization.cs.meta # Assets/XR/XRGeneralSettings.asset # ProjectSettings/HDRPProjectSettings.asset # UserSettings/EditorUserSettings.asset # unityProject.vrmanifest
Showing
- Assets/ExampleAssets/Materials/Grid.mat 4 additions, 9 deletionsAssets/ExampleAssets/Materials/Grid.mat
- Assets/Level.meta 8 additions, 0 deletionsAssets/Level.meta
- Assets/Materials/UI_Materials.meta 8 additions, 0 deletionsAssets/Materials/UI_Materials.meta
- Assets/Materials/UI_Materials/M_Grey.mat 77 additions, 0 deletionsAssets/Materials/UI_Materials/M_Grey.mat
- Assets/Materials/UI_Materials/M_Grey.mat.meta 8 additions, 0 deletionsAssets/Materials/UI_Materials/M_Grey.mat.meta
- Assets/Materials/UI_Materials/M_Pink.mat 77 additions, 0 deletionsAssets/Materials/UI_Materials/M_Pink.mat
- Assets/Materials/UI_Materials/M_Pink.mat.meta 8 additions, 0 deletionsAssets/Materials/UI_Materials/M_Pink.mat.meta
- Assets/Materials/UI_Materials/M_Transparent.mat 78 additions, 0 deletionsAssets/Materials/UI_Materials/M_Transparent.mat
- Assets/Materials/UI_Materials/M_Transparent.mat.meta 8 additions, 0 deletionsAssets/Materials/UI_Materials/M_Transparent.mat.meta
- Assets/Materials/UI_Materials/M_White.mat 78 additions, 0 deletionsAssets/Materials/UI_Materials/M_White.mat
- Assets/Materials/UI_Materials/M_White.mat.meta 8 additions, 0 deletionsAssets/Materials/UI_Materials/M_White.mat.meta
- Assets/Materials/UI_Materials/MenuCubeMat.mat 78 additions, 0 deletionsAssets/Materials/UI_Materials/MenuCubeMat.mat
- Assets/Materials/UI_Materials/MenuCubeMat.mat.meta 8 additions, 0 deletionsAssets/Materials/UI_Materials/MenuCubeMat.mat.meta
- Assets/Scenes/MainMenuSteam.unity 3888 additions, 0 deletionsAssets/Scenes/MainMenuSteam.unity
- Assets/Scenes/MainMenuSteam.unity.meta 7 additions, 0 deletionsAssets/Scenes/MainMenuSteam.unity.meta
- Assets/Scenes/SampleScene.unity.meta 7 additions, 7 deletionsAssets/Scenes/SampleScene.unity.meta
- Assets/Scripts/UI.meta 8 additions, 0 deletionsAssets/Scripts/UI.meta
- Assets/Scripts/UI/ActiveObjects.cs 10 additions, 0 deletionsAssets/Scripts/UI/ActiveObjects.cs
- Assets/Scripts/UI/ActiveObjects.cs.meta 11 additions, 0 deletionsAssets/Scripts/UI/ActiveObjects.cs.meta
- Assets/Scripts/UI/Button.cs 48 additions, 0 deletionsAssets/Scripts/UI/Button.cs
Loading
Please register or sign in to comment