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

Add "pause" menu #583

Closed
wants to merge 4 commits into from
Closed

Add "pause" menu #583

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
0bfde17
Make up/down in item select match left/right
toberge Mar 16, 2024
31b7ef5
Fix loading screen scaling
toberge Mar 16, 2024
33458eb
Fix soda can explosion nullptr reference
toberge Mar 17, 2024
d51ee20
Add basic "pause" menu
toberge Mar 16, 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
715 changes: 709 additions & 6 deletions Assets/Prefabs/Input/Player.prefab
View file
Open in desktop

Large diffs are not rendered by default.

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/CraterTown.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: 662445327}
m_IndirectSpecularColor: {r: 0.09672264, g: 0.24035963, b: 0.4926994, a: 1}
m_IndirectSpecularColor: {r: 0.03905226, g: 0.20194778, b: 0.4885325, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down
204 changes: 145 additions & 59 deletions Assets/ScriptableObjects/Input/PlayerControls.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Exit",
"type": "Button",
"id": "59e83c07-8e52-4bf8-9438-5a6d37054de2",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -284,7 +293,7 @@
{
"name": "",
"id": "0030f558-1dce-4039-95e4-2c065ead1db1",
"path": "<Keyboard>/escape",
"path": "<Keyboard>/backspace",
"interactions": "",
"processors": "",
"groups": "MouseAndKeyboard",
Expand Down Expand Up @@ -478,6 +487,50 @@
"action": "LeftTab",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9a1572fe-6205-45fc-8244-3502f75c7d39",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8f4504be-133a-4f66-b0d3-793290c87279",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "846526c8-752a-4905-9e41-6ec6d2d80a37",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3670069a-df39-40ea-8a7c-c4b797451183",
"path": "<Keyboard>/p",
"interactions": "",
"processors": "",
"groups": "",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
}
]
},
Expand All @@ -494,15 +547,6 @@
"interactions": "",
"initialStateCheck": false
},
{
"name": "Cancel",
"type": "Button",
"id": "6c813086-0914-48e7-a994-f4c36f04f63c",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Move",
"type": "Value",
Expand Down Expand Up @@ -556,6 +600,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Exit",
"type": "Button",
"id": "6c813086-0914-48e7-a994-f4c36f04f63c",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand All @@ -581,28 +634,6 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "898c171c-67f9-4de3-b99e-3eea3e5a4dda",
"path": "<Gamepad>/buttonEast",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Cancel",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "fe8cd325-d420-4946-a7f0-40e4e1c72e6e",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "MouseAndKeyboard",
"action": "Cancel",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "65cc362b-78a9-46ba-b196-d471cbc76387",
Expand Down Expand Up @@ -800,6 +831,50 @@
"action": "Interact",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "898c171c-67f9-4de3-b99e-3eea3e5a4dda",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b5e45b4a-8d1c-4a6b-90af-6270f64a9acf",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "fe8cd325-d420-4946-a7f0-40e4e1c72e6e",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "MouseAndKeyboard",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "be69b80f-1ccc-473a-9084-888986ef60df",
"path": "<Keyboard>/p",
"interactions": "",
"processors": "",
"groups": "",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
}
]
},
Expand All @@ -826,27 +901,27 @@
"initialStateCheck": true
},
{
"name": "Cancel",
"name": "Select",
"type": "Button",
"id": "9e0bf922-98f3-49e8-9ea8-7897bbb5249f",
"id": "81e31669-1c45-46b3-b49d-6daa89095b81",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Select",
"name": "Interact",
"type": "Button",
"id": "81e31669-1c45-46b3-b49d-6daa89095b81",
"id": "360c3d67-b75e-4f1a-8700-e3d62ef4f857",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Interact",
"name": "Exit",
"type": "Button",
"id": "360c3d67-b75e-4f1a-8700-e3d62ef4f857",
"id": "9e0bf922-98f3-49e8-9ea8-7897bbb5249f",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
Expand Down Expand Up @@ -944,67 +1019,78 @@
},
{
"name": "",
"id": "4b0e4d83-9aaf-4d27-8ef7-830284a247cc",
"path": "<Gamepad>/buttonEast",
"id": "5d89d078-c0ba-4983-9a06-ce3dd87d1f5d",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Cancel",
"action": "Select",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "56f3ff90-eaed-417f-806b-5c5933c8b942",
"path": "<Keyboard>/escape",
"id": "6ffc950e-93eb-4518-b7b3-03abbd49ce61",
"path": "<Keyboard>/space",
"interactions": "",
"processors": "",
"groups": "MouseAndKeyboard",
"action": "Cancel",
"action": "Select",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5d89d078-c0ba-4983-9a06-ce3dd87d1f5d",
"path": "<Gamepad>/buttonSouth",
"id": "221ae938-7c34-4327-a946-e4033836ec8b",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Select",
"groups": "",
"action": "Interact",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6ffc950e-93eb-4518-b7b3-03abbd49ce61",
"path": "<Keyboard>/space",
"id": "74ac9ab7-57d5-4345-94df-a44090407788",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "MouseAndKeyboard",
"action": "Select",
"groups": "",
"action": "Interact",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "221ae938-7c34-4327-a946-e4033836ec8b",
"path": "<Gamepad>/buttonNorth",
"id": "4b0e4d83-9aaf-4d27-8ef7-830284a247cc",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "",
"action": "Interact",
"groups": "Gamepad",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "74ac9ab7-57d5-4345-94df-a44090407788",
"path": "<Keyboard>/f",
"id": "55d97c0c-c237-4916-8da5-6e4d5ee4e368",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "",
"action": "Interact",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "56f3ff90-eaed-417f-806b-5c5933c8b942",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "MouseAndKeyboard",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
}
Expand Down
Loading