ntr/spacerace
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into flashy-maps

Browse Source
This commit is contained in:
Nathan Rashleigh committed 2025-10-08 22:20:59 +11:00
2 parents b461457bcc 63b8169726
commit a96d205633
4 files changed
+24 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Src/UI/Menu.uss
+11 -2
View File
@@ -14,11 +14,11 @@
height: 256px;
}
#left {
/*#left {
padding-left: 24px;
padding-bottom: 24px;
}
*/
Button {
background-color: rgba(0, 0, 0, 0.26);
color: rgb(255, 255, 255);
@@ -29,3 +29,12 @@ Button {
margin-right: 0;
min-width: 128px;
}
#body {
padding: 24px;
background-color: rgba(0, 0, 0, 0.62);
}
#right {
width: 100%;
}
Assets/Src/UI/Menu.uxml
+11 -11
View File
@@ -1,32 +1,32 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<Style src="project://database/Assets/Src/UI/Menu.uss?fileID=7433441132597879392&amp;guid=144cc2c04c975bad88fb864cea91f099&amp;type=3#Menu" />
<Style src="project://database/Assets/Src/UI/menu.uss?fileID=7433441132597879392&amp;guid=144cc2c04c975bad88fb864cea91f099&amp;type=3#menu" />
<Style src="project://database/Assets/Src/UI/Global.uss?fileID=7433441132597879392&amp;guid=000591923dc977463bf0fd9f4e7d463e&amp;type=3#Global" />
<ui:VisualElement name="main" class="nav" style="flex-grow: 1;">
<ui:VisualElement name="body" style="flex-direction: row; height: 100%;">
<ui:VisualElement name="left" style="flex-grow: 0; flex-basis: 50%; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; flex-wrap: wrap;">
<ui:VisualElement name="tracksCtr" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
<ui:VisualElement name="body" style="flex-direction: row; height: 100%; justify-content: center; flex-wrap: wrap;">
<ui:VisualElement name="left" style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; width: 50%; align-self: auto; align-items: stretch; flex-wrap: wrap;">
<ui:VisualElement name="tracksCtr" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); margin-right: 24px;">
<ui:Label text="TRACK" display-tooltip-when-elided="true" name="Track" style="-unity-font: url(&apos;project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&amp;guid=1d103e83da4f14189b3e8b0b865eca3d&amp;type=3#Jura-DemiBold&apos;); -unity-font-style: bold;" />
<ui:VisualElement name="tracks" style="flex-wrap: nowrap;">
<ui:VisualElement name="tracks">
<ui:Button text="sr_junglism" display-tooltip-when-elided="true" />
<ui:Button text="sr_silverstorage" display-tooltip-when-elided="true" />
<ui:Button text="sr_pascal" display-tooltip-when-elided="true" />
<ui:Button text="sr_alpha_centaurus" display-tooltip-when-elided="true" />
<ui:Button text="sr_sfz" display-tooltip-when-elided="true" />
<ui:Button text="sr_alpha_centaurus" display-tooltip-when-elided="true" />
<ui:Button text="sr_pascal" display-tooltip-when-elided="true" />
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="settings" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible;">
<ui:VisualElement name="settings" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible; flex-shrink: 0;">
<ui:Label tabindex="-1" text="CONTROLS" display-tooltip-when-elided="true" style="-unity-font-style: bold; align-items: auto;" />
<ui:Slider label="View Sensitivity" value="1" high-value="3" name="viewSens" low-value="0.1" show-input-field="false" style="width: 100%;" />
<ui:Label tabindex="-1" text="Label" display-tooltip-when-elided="true" name="viewSensLabel" style="-unity-text-align: upper-right; align-self: flex-end;" />
<ui:Toggle label="Invert Y" name="invertY" tooltip="Invert Y Axis Controls" value="false" />
</ui:VisualElement>
<ui:VisualElement name="audio" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible;">
<ui:VisualElement name="audio" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible; flex-shrink: 0;">
<ui:Label tabindex="-1" text="AUDIO" display-tooltip-when-elided="true" style="-unity-font-style: bold; align-items: auto;" />
<ui:Toggle label="Mute" name="muteAudioToggle" />
</ui:VisualElement>
<ui:Button text="EXIT" display-tooltip-when-elided="true" name="exit" tabindex="2" class="exit" style="justify-content: flex-start;" />
<ui:Button text="EXIT" display-tooltip-when-elided="true" name="exit" tabindex="2" class="exit" style="flex-direction: row;" />
</ui:VisualElement>
<ui:VisualElement name="right" style="background-image: url(&apos;project://database/Assets/Images/Controls.HUD.png?fileID=2800000&amp;guid=16a9df7a449918546a5000d9830d1e2a&amp;type=3#Controls.HUD&apos;); flex-grow: 1; -unity-background-scale-mode: scale-to-fit; align-self: stretch;" />
<ui:VisualElement name="right" style="background-image: url(&apos;project://database/Assets/Images/Controls.HUD.png?fileID=2800000&amp;guid=16a9df7a449918546a5000d9830d1e2a&amp;type=3#Controls.HUD&apos;); flex-grow: 0; -unity-background-scale-mode: scale-to-fit; align-items: stretch; flex-shrink: 1; flex-basis: 50%;" />
</ui:VisualElement>
</ui:VisualElement>
</ui:UXML>
Assets/WSATestCertificate.pfx
BIN
View File
Binary file not shown.
ProjectSettings/ProjectSettings.asset
+2 -1
View File
@@ -138,7 +138,8 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 1.0
preloadedAssets: []
preloadedAssets:
- {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1