Skip to content

Commit 2e492d8

Browse files
committed
Merge branch 'pr-bash' into main
# Conflicts: # UOP1_Project/Assets/Scripts/Input/GameInput.cs # UOP1_Project/Assets/Settings/Input/GameInput.inputactions
2 parents 9fc4a7f + 233a2ec commit 2e492d8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

UOP1_Project/Assets/Scripts/Input/GameInput.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ public @GameInput()
372372
""id"": ""2b832572-50ef-4dba-aaeb-964ed1c854bb"",
373373
""path"": ""<Gamepad>/rightStick"",
374374
""interactions"": """",
375-
""processors"": ""StickDeadzone,ScaleVector2(x=10,y=10)"",
375+
""processors"": ""StickDeadzone,ScaleVector2(x=8,y=8)"",
376376
""groups"": ""KeyboardOrGamepad"",
377377
""action"": ""RotateCamera"",
378378
""isComposite"": false,
@@ -383,7 +383,7 @@ public @GameInput()
383383
""id"": ""8e17360e-f036-4963-93f6-05d14787dfb5"",
384384
""path"": ""2DVector(mode=1)"",
385385
""interactions"": """",
386-
""processors"": ""ScaleVector2(x=10,y=10)"",
386+
""processors"": ""ScaleVector2(x=8,y=8)"",
387387
""groups"": """",
388388
""action"": ""RotateCamera"",
389389
""isComposite"": true,
@@ -449,7 +449,7 @@ public @GameInput()
449449
""id"": ""88e5a69d-cf1d-43ce-b5ab-9db67f819255"",
450450
""path"": ""<Mouse>/delta"",
451451
""interactions"": """",
452-
""processors"": """",
452+
""processors"": ""ScaleVector2(x=2,y=2)"",
453453
""groups"": ""KeyboardOrGamepad"",
454454
""action"": ""RotateCamera"",
455455
""isComposite"": false,

UOP1_Project/Assets/Settings/Input/GameInput.inputactions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
"id": "2b832572-50ef-4dba-aaeb-964ed1c854bb",
360360
"path": "<Gamepad>/rightStick",
361361
"interactions": "",
362-
"processors": "StickDeadzone,ScaleVector2(x=10,y=10)",
362+
"processors": "StickDeadzone,ScaleVector2(x=8,y=8)",
363363
"groups": "KeyboardOrGamepad",
364364
"action": "RotateCamera",
365365
"isComposite": false,
@@ -370,7 +370,7 @@
370370
"id": "8e17360e-f036-4963-93f6-05d14787dfb5",
371371
"path": "2DVector(mode=1)",
372372
"interactions": "",
373-
"processors": "ScaleVector2(x=10,y=10)",
373+
"processors": "ScaleVector2(x=8,y=8)",
374374
"groups": "",
375375
"action": "RotateCamera",
376376
"isComposite": true,
@@ -436,7 +436,7 @@
436436
"id": "88e5a69d-cf1d-43ce-b5ab-9db67f819255",
437437
"path": "<Mouse>/delta",
438438
"interactions": "",
439-
"processors": "",
439+
"processors": "ScaleVector2(x=2,y=2)",
440440
"groups": "KeyboardOrGamepad",
441441
"action": "RotateCamera",
442442
"isComposite": false,

0 commit comments

Comments
 (0)