Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/misc adjustments #592

Merged
merged 4 commits into from
Mar 22, 2024
Merged

Fix/misc adjustments #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
916d71c
Make up/down in item select match left/right
toberge Mar 16, 2024
b5ba3cd
Fix loading screen scaling
toberge Mar 16, 2024
9602b05
Fix soda can explosion nullptr reference
toberge Mar 17, 2024
5325c21
Add Hackerspace logo to splash screen
toberge Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Assets/Prefabs/Props/SodaCan.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ MonoBehaviour:
hitBoxLayers:
serializedVersion: 2
m_Bits: 8
soundEffect: {fileID: 11400000, guid: 28f9f37273016fc44a53dce269db19f7, type: 2}
--- !u!73398921 &5108171519858730855
VFXRenderer:
serializedVersion: 1
Expand Down Expand Up @@ -571,7 +572,7 @@ AudioSource:
m_GameObject: {fileID: 8071334714894161657}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
m_audioClip: {fileID: 8300000, guid: b6284216ae87a2813a7477ff5d4c4c7e, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
Expand Down
12 changes: 6 additions & 6 deletions Assets/Prefabs/UI/LoadingScreen.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1510, y: 970}
m_SizeDelta: {x: 3020, y: 1940}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4603235002760152902
CanvasRenderer:
Expand Down Expand Up @@ -417,8 +417,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 30
height: 20
width: 60
height: 40
--- !u!1 &3020746609343585238
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2003,9 +2003,9 @@ RectTransform:
m_Father: {fileID: 2576682853555585358}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -330, y: -158}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 70.4, y: 65.8}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8335990573788403378
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scenes/Menu.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 785370674}
m_IndirectSpecularColor: {r: 0.038585927, g: 0.20152009, b: 0.48817408, a: 1}
m_IndirectSpecularColor: {r: 0.039134946, g: 0.20201707, b: 0.48857865, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scripts/Control&Input/ItemSelectMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ private void MoveInputPerformed(InputAction.CallbackContext ctx)

if (moveInput.y > 1 - errorMarginInput && gamepadMoveReady)
{
MoveUpPerformed();
MoveDownPerformed();
DelayIfGamepad();
}
else if (moveInput.y < -1 + errorMarginInput && gamepadMoveReady)
{
MoveDownPerformed();
MoveUpPerformed();
DelayIfGamepad();
}
else if (moveInput.x < -1 + errorMarginInput && gamepadMoveReady)
Expand Down
Binary file added Assets/Textures/HackerspaceLogo.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
136 changes: 136 additions & 0 deletions Assets/Textures/HackerspaceLogo.jpeg.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions ProjectSettings/ProjectSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PlayerSettings:
productName: Red Planet Rampage
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.11764707, b: 0.121568635, a: 1}
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1
Expand All @@ -39,7 +39,9 @@ PlayerSettings:
y: 0
width: 1
height: 1
m_SplashScreenLogos: []
m_SplashScreenLogos:
- logo: {fileID: 21300000, guid: 66cdb6d46bd05ca4a9d33e7a331759a4, type: 3}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1920
Expand Down Expand Up @@ -133,7 +135,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.1
bundleVersion: 0.2
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
Expand Down