Skip to content

feat: distributed authority sample/expanded controls [MTT-9277] #256

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

Merged
merged 11 commits into from
Dec 2, 2024
Merged

feat: distributed authority sample/expanded controls [MTT-9277] #256

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7aca108
adding gamepad controls
fernando-cortez Nov 8, 2024
7d13906
adding mobile input wrapper, mobile UI, desktop & mobile actions ready
fernando-cortez Nov 15, 2024
f7140df
changelog addition
fernando-cortez Nov 18, 2024
fe79286
merge develop
fernando-cortez Nov 25, 2024
00af1e3
cleanup: typos, removed logs
fernando-cortez Nov 25, 2024
2456024
fix: Disabling VoiceChat for now as it causes a Permission Error on i…
hammerlerobi Nov 27, 2024
1f9b563
consistent access modifiers
fernando-cortez Nov 27, 2024
6fcdda7
Merge branch 'feat/distributed-authority-sample/expanded-controls' of…
fernando-cortez Nov 27, 2024
cae6a94
Merge branch 'develop' into feat/distributed-authority-sample/expande…
fernando-cortez Nov 27, 2024
ff199d4
fix: Make mobile controls setting available again
hammerlerobi Nov 28, 2024
d95d835
Merge branch 'develop' into feat/distributed-authority-sample/expande…
hammerlerobi Dec 2, 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
228 changes: 76 additions & 152 deletions Basic/DistributedAuthoritySocialHub/Assets/InputSystem/AvatarActions.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@
"interactions": "",
"initialStateCheck": true
},
{
"name": "Attack",
"type": "Button",
"id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Interact",
"type": "Button",
Expand All @@ -41,20 +32,11 @@
"interactions": "Hold,Tap",
"initialStateCheck": false
},
{
"name": "Crouch",
"type": "Button",
"id": "27c5f898-bc57-4ee1-8800-db469aca5fe3",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Jump",
"type": "Button",
"id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
Expand All @@ -63,7 +45,7 @@
"name": "Previous",
"type": "Button",
"id": "2776c80d-3c14-4091-8c56-d04ced07a2b0",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
Expand Down Expand Up @@ -103,6 +85,24 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "TogglePauseMenu",
"type": "Button",
"id": "4ec185e8-5c75-440f-8df1-53f74694ee1a",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ToggleNetworkStats",
"type": "Button",
"id": "74937bf8-b3f5-4dc9-a4f6-9a3dfce4fb14",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand All @@ -111,8 +111,8 @@
"id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403",
"path": "<Gamepad>/leftStick",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"processors": "StickDeadzone(max=1)",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": false
Expand Down Expand Up @@ -216,35 +216,13 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8",
"path": "<XRController>/{Primary2DAxis}",
"interactions": "",
"processors": "",
"groups": "XR",
"action": "Move",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3ea4d645-4504-4529-b061-ab81934c3752",
"path": "<Joystick>/stick",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Move",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"groups": "",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
Expand All @@ -255,7 +233,7 @@
"path": "<Pointer>/delta",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse;Touch",
"groups": ";Keyboard&Mouse",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
Expand All @@ -271,72 +249,6 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Attack",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "05f6913d-c316-48b2-a6bb-e225f14c7960",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Attack",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "886e731e-7071-4ae4-95c0-e61739dad6fd",
"path": "<Touchscreen>/primaryTouch/tap",
"interactions": "",
"processors": "",
"groups": ";Touch",
"action": "Attack",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54",
"path": "<Joystick>/trigger",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Attack",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8255d333-5683-4943-a58a-ccb207ff1dce",
"path": "<XRController>/{PrimaryAction}",
"interactions": "",
"processors": "",
"groups": "XR",
"action": "Attack",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7",
"path": "<Keyboard>/enter",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Attack",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed",
Expand Down Expand Up @@ -376,7 +288,7 @@
"path": "<Gamepad>/leftStickPress",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"groups": "",
"action": "Sprint",
"isComposite": false,
"isPartOfComposite": false
Expand Down Expand Up @@ -409,7 +321,7 @@
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"groups": "",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
Expand Down Expand Up @@ -461,55 +373,77 @@
{
"name": "",
"id": "b3f66d0b-7751-423f-908b-a11c5bd95930",
"path": "<Gamepad>/buttonNorth",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"groups": "",
"action": "Interact",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4f4649ac-64a8-4a73-af11-b3faef356a4d",
"path": "<Gamepad>/buttonEast",
"id": "1929240f-6e51-4531-830c-380b63b3b195",
"path": "<Mouse>/scroll/y",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Crouch",
"groups": ";Keyboard&Mouse",
"action": "Zoom",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a",
"path": "<Keyboard>/c",
"id": "68338c5f-a927-4676-b836-60c0cdadb297",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Crouch",
"groups": ";Keyboard&Mouse",
"action": "Rotate",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1929240f-6e51-4531-830c-380b63b3b195",
"path": "<Mouse>/scroll/y",
"id": "e02a3b8f-618d-4f9f-8ec7-bedfd0ee0552",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Zoom",
"action": "TogglePauseMenu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "68338c5f-a927-4676-b836-60c0cdadb297",
"path": "<Mouse>/rightButton",
"id": "44983d7e-ec02-4caa-8ed6-b4ba369340c6",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "",
"action": "TogglePauseMenu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "cbad3a7c-1808-4d24-80cc-505350482605",
"path": "<Keyboard>/m",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Rotate",
"action": "ToggleNetworkStats",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "da48980a-c70a-4552-a7f1-e5aa973f3a8c",
"path": "<Touchscreen>/touch3/tap",
"interactions": "",
"processors": "",
"groups": ";Touch",
"action": "ToggleNetworkStats",
"isComposite": false,
"isPartOfComposite": false
}
Expand All @@ -532,7 +466,7 @@
"name": "Submit",
"type": "Button",
"id": "7607c7b6-cd76-4816-beef-bd0341cfe950",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
Expand All @@ -541,7 +475,7 @@
"name": "Cancel",
"type": "Button",
"id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
Expand Down Expand Up @@ -608,15 +542,6 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ShowNetworkStats",
"type": "Button",
"id": "4b6bb4e4-7ecf-48df-be01-616de9cd0ff8",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -1037,17 +962,6 @@
"action": "TrackedDeviceOrientation",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "249f3bcc-4eed-4959-bc3f-d719bc91d034",
"path": "<Keyboard>/#(M)",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "ShowNetworkStats",
"isComposite": false,
"isPartOfComposite": false
}
]
}
Expand All @@ -1066,6 +980,11 @@
"devicePath": "<Mouse>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Gamepad>",
"isOptional": true,
"isOR": false
}
]
},
Expand All @@ -1088,6 +1007,11 @@
"devicePath": "<Touchscreen>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Gamepad>",
"isOptional": true,
"isOR": false
}
]
},
Expand Down
Loading