Skip to content

Commit a25c0c0

Browse files
suearkinunitysuearkinunity
authored
Merge branch 'develop' into sue-arkin-cepm-update
2 parents eeea6b0 + 2255883 commit a25c0c0

735 files changed

Lines changed: 2934 additions & 1856 deletions

File tree

Some content is hidden

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

‎.github/workflows/check-runtime-editor-refs.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Check Editor references in Runtime code
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
branches: [ "develop" ]
10+
11+
workflow_dispatch:
12+
13+
jobs:
14+
check-runtime-editor-refs:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Check Runtime code has no Editor namespace references
20+
run: bash check-runtime-editor-refs.sh

‎.yamato/wrench/pvp-exemptions.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@
127127
},
128128
"PVP-92-3": {
129129
"errors": [
130-
"InputSystem/Plugins/iOS/IOSGameController.cs: .Switch;",
131-
"InputSystem/Plugins/Switch/SwitchProController.cs: .Switch\n",
132-
"InputSystem/Plugins/Switch/SwitchProControllerHID.cs: .Switch.",
133-
"InputSystem/Plugins/Switch/SwitchProControllerHID.cs: .Switch\n",
134-
"InputSystem/Plugins/Switch/SwitchSupportHID.cs: .Switch\n",
135-
"Documentation~/Gamepad.md: .Switch."
130+
"Documentation~/Gamepad.md: .Switch.",
131+
"InputSystem/Runtime/Plugins/iOS/IOSGameController.cs: .Switch;",
132+
"InputSystem/Runtime/Plugins/Switch/SwitchProController.cs: .Switch\n",
133+
"InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch.",
134+
"InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch\n",
135+
"InputSystem/Runtime/Plugins/Switch/SwitchSupportHID.cs: .Switch\n"
136136
]
137137
},
138138
"PVP-124-2": {

‎Assets/QA/Tests/Touch/ISX_Touch.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/QA/Tests/XRDeviceActions/XRDeviceActions.asmdef‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "XRDeviceActions",
3+
"rootNamespace": "",
34
"references": [
4-
"GUID:28d8685fae23c21419ef42894cb9b075",
5-
"GUID:75469ad4d38634e559750d17036d5f7c",
6-
"GUID:2bafac87e7f4b9b418d9448d219b01ab"
5+
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
77
],
88
"includePlatforms": [],
99
"excludePlatforms": [],

‎Assets/Samples/InGameHints/Unity.InputSystem.InGameHints.asmdef‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"name": "Unity.InputSystem.InGameHints",
3+
"rootNamespace": "",
34
"references": [
4-
"GUID:75469ad4d38634e559750d17036d5f7c",
5-
"GUID:2bafac87e7f4b9b418d9448d219b01ab"
5+
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
67
],
78
"includePlatforms": [],
89
"excludePlatforms": [],

‎Assets/Samples/InputRecorder/Unity.InputSystem.Recorder.asmdef‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "Unity.InputSystem.Recorder",
3+
"rootNamespace": "",
34
"references": [
45
"GUID:75469ad4d38634e559750d17036d5f7c"
56
],
6-
"optionalUnityReferences": [],
77
"includePlatforms": [],
88
"excludePlatforms": [],
99
"allowUnsafeCode": true,
1010
"overrideReferences": false,
1111
"precompiledReferences": [],
1212
"autoReferenced": true,
1313
"defineConstraints": [],
14-
"versionDefines": []
14+
"versionDefines": [],
15+
"noEngineReferences": false
1516
}

‎Assets/Samples/RebindingUI/Unity.InputSystem.RebindingUI.asmdef‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "Unity.InputSystem.RebindingUI",
3+
"rootNamespace": "",
34
"references": [
45
"GUID:75469ad4d38634e559750d17036d5f7c"
56
],
6-
"optionalUnityReferences": [],
77
"includePlatforms": [],
88
"excludePlatforms": [],
99
"allowUnsafeCode": false,
1010
"overrideReferences": false,
1111
"precompiledReferences": [],
1212
"autoReferenced": false,
1313
"defineConstraints": [],
14-
"versionDefines": []
14+
"versionDefines": [],
15+
"noEngineReferences": false
1516
}

‎Assets/Samples/SimpleDemo/SimpleDemo_UsingActionAsset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Samples/UIvsGameInput/Unity.InputSystem.UIvsGameInput.asmdef‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"name": "UnityEngine.InputSystem.Samples.UIvsGameInput",
3+
"rootNamespace": "",
34
"references": [
4-
"GUID:75469ad4d38634e559750d17036d5f7c",
5-
"GUID:2bafac87e7f4b9b418d9448d219b01ab"
5+
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
67
],
78
"includePlatforms": [],
89
"excludePlatforms": [],

‎Assets/Samples/Visualizers/Unity.InputSystem.Visualizers.asmdef‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "InputSystem.Samples.Visualizers",
3+
"rootNamespace": "",
34
"references": [
45
"GUID:75469ad4d38634e559750d17036d5f7c"
56
],
6-
"optionalUnityReferences": [],
77
"includePlatforms": [],
88
"excludePlatforms": [],
99
"allowUnsafeCode": true,
1010
"overrideReferences": false,
1111
"precompiledReferences": [],
1212
"autoReferenced": true,
1313
"defineConstraints": [],
14-
"versionDefines": []
14+
"versionDefines": [],
15+
"noEngineReferences": false
1516
}

0 commit comments

Comments
 (0)