Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 0fc1298

Browse files
Final changes
should not need to work on the game anymore all changes that i wanted to make have been made
1 parent de2fc48 commit 0fc1298

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+190782
-309450
lines changed
-20 MB
Binary file not shown.
2.59 MB
Binary file not shown.

‎Native/Assets/Audio/Menu Music/Road to Nowhere.wav.meta renamed to ‎Native/Assets/Audio/Music/Infraction- Insanely Evil_MenuCut.wav.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Native/Assets/Input Systems/SinglePlayerInput.cs

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,6 @@ public @SinglePlayerInput()
114114
""isComposite"": false,
115115
""isPartOfComposite"": true
116116
},
117-
{
118-
""name"": ""up"",
119-
""id"": ""41c09827-198d-4bf7-ac15-3631ab2622b0"",
120-
""path"": ""<Keyboard>/w"",
121-
""interactions"": """",
122-
""processors"": """",
123-
""groups"": """",
124-
""action"": ""Movement"",
125-
""isComposite"": false,
126-
""isPartOfComposite"": true
127-
},
128117
{
129118
""name"": ""down"",
130119
""id"": ""f589d71c-f97a-4714-a65f-1824bf3051f4"",
@@ -136,17 +125,6 @@ public @SinglePlayerInput()
136125
""isComposite"": false,
137126
""isPartOfComposite"": true
138127
},
139-
{
140-
""name"": ""down"",
141-
""id"": ""d2a57d69-8be4-4cc7-856d-d62034d77d29"",
142-
""path"": ""<Keyboard>/s"",
143-
""interactions"": """",
144-
""processors"": """",
145-
""groups"": """",
146-
""action"": ""Movement"",
147-
""isComposite"": false,
148-
""isPartOfComposite"": true
149-
},
150128
{
151129
""name"": ""left"",
152130
""id"": ""7c396575-63cd-4ebd-8f2b-9586fac526ff"",
@@ -158,17 +136,6 @@ public @SinglePlayerInput()
158136
""isComposite"": false,
159137
""isPartOfComposite"": true
160138
},
161-
{
162-
""name"": ""left"",
163-
""id"": ""52ebf70e-45ce-4fc5-99e4-d1b4ec378f7d"",
164-
""path"": ""<Keyboard>/a"",
165-
""interactions"": """",
166-
""processors"": """",
167-
""groups"": """",
168-
""action"": ""Movement"",
169-
""isComposite"": false,
170-
""isPartOfComposite"": true
171-
},
172139
{
173140
""name"": ""right"",
174141
""id"": ""220240f8-7b45-4066-993b-57edb4284167"",
@@ -180,17 +147,6 @@ public @SinglePlayerInput()
180147
""isComposite"": false,
181148
""isPartOfComposite"": true
182149
},
183-
{
184-
""name"": ""right"",
185-
""id"": ""c7b11742-0f2d-4999-9e53-beb3c1f70a7a"",
186-
""path"": ""<Keyboard>/d"",
187-
""interactions"": """",
188-
""processors"": """",
189-
""groups"": """",
190-
""action"": ""Movement"",
191-
""isComposite"": false,
192-
""isPartOfComposite"": true
193-
},
194150
{
195151
""name"": """",
196152
""id"": ""89c10ffa-6fb7-4659-aedf-bbbb49062f27"",
@@ -202,17 +158,6 @@ public @SinglePlayerInput()
202158
""isComposite"": false,
203159
""isPartOfComposite"": false
204160
},
205-
{
206-
""name"": """",
207-
""id"": ""0f993765-9f6f-49d4-9620-365dd66c7b2d"",
208-
""path"": ""<Keyboard>/e"",
209-
""interactions"": """",
210-
""processors"": """",
211-
""groups"": """",
212-
""action"": ""Pickup"",
213-
""isComposite"": false,
214-
""isPartOfComposite"": false
215-
},
216161
{
217162
""name"": """",
218163
""id"": ""8915b76b-adce-4b3b-85e3-cf7a261ec4ed"",
@@ -224,17 +169,6 @@ public @SinglePlayerInput()
224169
""isComposite"": false,
225170
""isPartOfComposite"": false
226171
},
227-
{
228-
""name"": """",
229-
""id"": ""5c48e9bf-05c3-4ebd-b278-dc08382b99ac"",
230-
""path"": ""<Keyboard>/q"",
231-
""interactions"": """",
232-
""processors"": """",
233-
""groups"": """",
234-
""action"": ""Throw"",
235-
""isComposite"": false,
236-
""isPartOfComposite"": false
237-
},
238172
{
239173
""name"": """",
240174
""id"": ""13ad6110-f91d-415f-b116-d205e05ee053"",
@@ -246,17 +180,6 @@ public @SinglePlayerInput()
246180
""isComposite"": false,
247181
""isPartOfComposite"": false
248182
},
249-
{
250-
""name"": """",
251-
""id"": ""b51228f9-4755-430c-b871-a3385a9d41d8"",
252-
""path"": ""<Mouse>/leftButton"",
253-
""interactions"": """",
254-
""processors"": """",
255-
""groups"": """",
256-
""action"": ""Shoot"",
257-
""isComposite"": false,
258-
""isPartOfComposite"": false
259-
},
260183
{
261184
""name"": """",
262185
""id"": ""ff3ef483-02b6-4c23-bce4-cbaaff36cd38"",
@@ -268,17 +191,6 @@ public @SinglePlayerInput()
268191
""isComposite"": false,
269192
""isPartOfComposite"": false
270193
},
271-
{
272-
""name"": """",
273-
""id"": ""52ba52e2-cf10-41cb-a825-cca230f2d4a0"",
274-
""path"": ""<Keyboard>/leftShift"",
275-
""interactions"": """",
276-
""processors"": """",
277-
""groups"": """",
278-
""action"": ""Dodge"",
279-
""isComposite"": false,
280-
""isPartOfComposite"": false
281-
},
282194
{
283195
""name"": """",
284196
""id"": ""4a7bb807-5f9c-4dce-be24-747076f98c6b"",
@@ -290,17 +202,6 @@ public @SinglePlayerInput()
290202
""isComposite"": false,
291203
""isPartOfComposite"": false
292204
},
293-
{
294-
""name"": """",
295-
""id"": ""d4179b52-5605-44b9-acf5-680506393447"",
296-
""path"": ""<Keyboard>/escape"",
297-
""interactions"": """",
298-
""processors"": """",
299-
""groups"": """",
300-
""action"": ""Pause"",
301-
""isComposite"": false,
302-
""isPartOfComposite"": false
303-
},
304205
{
305206
""name"": """",
306207
""id"": ""cfc2d032-3c14-460e-abca-5fbc6efa66b0"",

‎Native/Assets/Input Systems/SinglePlayerInput.inputactions

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,6 @@
9292
"isComposite": false,
9393
"isPartOfComposite": true
9494
},
95-
{
96-
"name": "up",
97-
"id": "41c09827-198d-4bf7-ac15-3631ab2622b0",
98-
"path": "<Keyboard>/w",
99-
"interactions": "",
100-
"processors": "",
101-
"groups": "",
102-
"action": "Movement",
103-
"isComposite": false,
104-
"isPartOfComposite": true
105-
},
10695
{
10796
"name": "down",
10897
"id": "f589d71c-f97a-4714-a65f-1824bf3051f4",
@@ -114,17 +103,6 @@
114103
"isComposite": false,
115104
"isPartOfComposite": true
116105
},
117-
{
118-
"name": "down",
119-
"id": "d2a57d69-8be4-4cc7-856d-d62034d77d29",
120-
"path": "<Keyboard>/s",
121-
"interactions": "",
122-
"processors": "",
123-
"groups": "",
124-
"action": "Movement",
125-
"isComposite": false,
126-
"isPartOfComposite": true
127-
},
128106
{
129107
"name": "left",
130108
"id": "7c396575-63cd-4ebd-8f2b-9586fac526ff",
@@ -136,17 +114,6 @@
136114
"isComposite": false,
137115
"isPartOfComposite": true
138116
},
139-
{
140-
"name": "left",
141-
"id": "52ebf70e-45ce-4fc5-99e4-d1b4ec378f7d",
142-
"path": "<Keyboard>/a",
143-
"interactions": "",
144-
"processors": "",
145-
"groups": "",
146-
"action": "Movement",
147-
"isComposite": false,
148-
"isPartOfComposite": true
149-
},
150117
{
151118
"name": "right",
152119
"id": "220240f8-7b45-4066-993b-57edb4284167",
@@ -158,17 +125,6 @@
158125
"isComposite": false,
159126
"isPartOfComposite": true
160127
},
161-
{
162-
"name": "right",
163-
"id": "c7b11742-0f2d-4999-9e53-beb3c1f70a7a",
164-
"path": "<Keyboard>/d",
165-
"interactions": "",
166-
"processors": "",
167-
"groups": "",
168-
"action": "Movement",
169-
"isComposite": false,
170-
"isPartOfComposite": true
171-
},
172128
{
173129
"name": "",
174130
"id": "89c10ffa-6fb7-4659-aedf-bbbb49062f27",
@@ -180,17 +136,6 @@
180136
"isComposite": false,
181137
"isPartOfComposite": false
182138
},
183-
{
184-
"name": "",
185-
"id": "0f993765-9f6f-49d4-9620-365dd66c7b2d",
186-
"path": "<Keyboard>/e",
187-
"interactions": "",
188-
"processors": "",
189-
"groups": "",
190-
"action": "Pickup",
191-
"isComposite": false,
192-
"isPartOfComposite": false
193-
},
194139
{
195140
"name": "",
196141
"id": "8915b76b-adce-4b3b-85e3-cf7a261ec4ed",
@@ -202,17 +147,6 @@
202147
"isComposite": false,
203148
"isPartOfComposite": false
204149
},
205-
{
206-
"name": "",
207-
"id": "5c48e9bf-05c3-4ebd-b278-dc08382b99ac",
208-
"path": "<Keyboard>/q",
209-
"interactions": "",
210-
"processors": "",
211-
"groups": "",
212-
"action": "Throw",
213-
"isComposite": false,
214-
"isPartOfComposite": false
215-
},
216150
{
217151
"name": "",
218152
"id": "13ad6110-f91d-415f-b116-d205e05ee053",
@@ -224,17 +158,6 @@
224158
"isComposite": false,
225159
"isPartOfComposite": false
226160
},
227-
{
228-
"name": "",
229-
"id": "b51228f9-4755-430c-b871-a3385a9d41d8",
230-
"path": "<Mouse>/leftButton",
231-
"interactions": "",
232-
"processors": "",
233-
"groups": "",
234-
"action": "Shoot",
235-
"isComposite": false,
236-
"isPartOfComposite": false
237-
},
238161
{
239162
"name": "",
240163
"id": "ff3ef483-02b6-4c23-bce4-cbaaff36cd38",
@@ -246,17 +169,6 @@
246169
"isComposite": false,
247170
"isPartOfComposite": false
248171
},
249-
{
250-
"name": "",
251-
"id": "52ba52e2-cf10-41cb-a825-cca230f2d4a0",
252-
"path": "<Keyboard>/leftShift",
253-
"interactions": "",
254-
"processors": "",
255-
"groups": "",
256-
"action": "Dodge",
257-
"isComposite": false,
258-
"isPartOfComposite": false
259-
},
260172
{
261173
"name": "",
262174
"id": "4a7bb807-5f9c-4dce-be24-747076f98c6b",
@@ -268,17 +180,6 @@
268180
"isComposite": false,
269181
"isPartOfComposite": false
270182
},
271-
{
272-
"name": "",
273-
"id": "d4179b52-5605-44b9-acf5-680506393447",
274-
"path": "<Keyboard>/escape",
275-
"interactions": "",
276-
"processors": "",
277-
"groups": "",
278-
"action": "Pause",
279-
"isComposite": false,
280-
"isPartOfComposite": false
281-
},
282183
{
283184
"name": "",
284185
"id": "cfc2d032-3c14-460e-abca-5fbc6efa66b0",

‎Native/Assets/Player/Scripts/PlayerMovement.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class PlayerMovement : MonoBehaviour
3030
private void Awake()
3131
{
3232
_rb = this.GetComponent<Rigidbody>();
33-
3433
string savedInput = PlayerPrefs.GetString("Controls2", string.Empty);
3534
playerInput.actions.LoadBindingOverridesFromJson(savedInput);
3635
}

‎Native/Assets/Audio/Menu Music.meta renamed to ‎Native/Assets/Scenes/Level 1_1.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /