Skip to content

Commit 02e53b3

Browse files
authored
Merge pull request #196 from De-Panther/minimum_unity_version
New minimum Unity version to support updated WebXR Input Profiles Loader
2 parents b4f0a28 + 7d2caab commit 02e53b3

File tree

15 files changed

+203
-33
lines changed

15 files changed

+203
-33
lines changed

DebugProjects/Unity2019.4/Packages/manifest.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
}
1111
],
1212
"dependencies": {
13-
"com.de-panther.webxr-input-profiles-loader": "0.3.7",
13+
"com.de-panther.webxr-input-profiles-loader": "0.4.0",
1414
"com.unity.ide.rider": "2.0.5",
15+
"com.unity.ide.visualstudio": "2.0.11",
1516
"com.unity.ide.vscode": "1.2.3",
16-
"com.unity.test-framework": "1.1.16",
17-
"com.unity.timeline": "1.2.16",
17+
"com.unity.test-framework": "1.1.29",
18+
"com.unity.timeline": "1.2.18",
1819
"com.unity.ugui": "1.0.0",
19-
"com.unity.xr.management": "3.2.13",
20-
"com.unity.xr.oculus": "1.4.3",
20+
"com.unity.xr.management": "4.0.1",
21+
"com.unity.xr.oculus": "1.5.1",
2122
"com.unity.modules.ai": "1.0.0",
2223
"com.unity.modules.androidjni": "1.0.0",
2324
"com.unity.modules.animation": "1.0.0",

DebugProjects/Unity2019.4/Packages/packages-lock.json

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"dependencies": {
33
"com.atteneder.gltfast": {
4-
"version": "4.0.1",
4+
"version": "4.4.8",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {
88
"com.unity.modules.jsonserialize": "1.0.0",
99
"com.unity.modules.unitywebrequest": "1.0.0",
1010
"com.unity.modules.unitywebrequesttexture": "1.0.0",
11-
"com.unity.mathematics": "1.2.1"
11+
"com.unity.mathematics": "1.2.1",
12+
"com.unity.burst": "1.4.11"
1213
},
1314
"url": "https://package.openupm.com"
1415
},
@@ -21,12 +22,12 @@
2122
}
2223
},
2324
"com.de-panther.webxr-input-profiles-loader": {
24-
"version": "0.3.7",
25+
"version": "0.4.0",
2526
"depth": 0,
2627
"source": "registry",
2728
"dependencies": {
2829
"com.unity.nuget.newtonsoft-json": "2.0.0",
29-
"com.atteneder.gltfast": "4.0.1"
30+
"com.atteneder.gltfast": "4.4.8"
3031
},
3132
"url": "https://package.openupm.com"
3233
},
@@ -35,11 +36,20 @@
3536
"depth": 0,
3637
"source": "embedded",
3738
"dependencies": {
38-
"com.de-panther.webxr": "0.12.0-preview"
39+
"com.de-panther.webxr": "0.13.0-preview"
3940
}
4041
},
42+
"com.unity.burst": {
43+
"version": "1.4.11",
44+
"depth": 2,
45+
"source": "registry",
46+
"dependencies": {
47+
"com.unity.mathematics": "1.2.1"
48+
},
49+
"url": "https://packages.unity.com"
50+
},
4151
"com.unity.ext.nunit": {
42-
"version": "1.0.0",
52+
"version": "1.0.6",
4353
"depth": 1,
4454
"source": "registry",
4555
"dependencies": {},
@@ -54,6 +64,15 @@
5464
},
5565
"url": "https://packages.unity.com"
5666
},
67+
"com.unity.ide.visualstudio": {
68+
"version": "2.0.11",
69+
"depth": 0,
70+
"source": "registry",
71+
"dependencies": {
72+
"com.unity.test-framework": "1.1.9"
73+
},
74+
"url": "https://packages.unity.com"
75+
},
5776
"com.unity.ide.vscode": {
5877
"version": "1.2.3",
5978
"depth": 0,
@@ -83,54 +102,66 @@
83102
"url": "https://packages.unity.com"
84103
},
85104
"com.unity.test-framework": {
86-
"version": "1.1.16",
105+
"version": "1.1.29",
87106
"depth": 0,
88107
"source": "registry",
89108
"dependencies": {
90-
"com.unity.ext.nunit": "1.0.0",
109+
"com.unity.ext.nunit": "1.0.6",
91110
"com.unity.modules.imgui": "1.0.0",
92111
"com.unity.modules.jsonserialize": "1.0.0"
93112
},
94113
"url": "https://packages.unity.com"
95114
},
96115
"com.unity.timeline": {
97-
"version": "1.2.16",
116+
"version": "1.2.18",
98117
"depth": 0,
99118
"source": "registry",
100-
"dependencies": {},
119+
"dependencies": {
120+
"com.unity.modules.director": "1.0.0",
121+
"com.unity.modules.animation": "1.0.0",
122+
"com.unity.modules.audio": "1.0.0",
123+
"com.unity.modules.particlesystem": "1.0.0"
124+
},
101125
"url": "https://packages.unity.com"
102126
},
103127
"com.unity.ugui": {
104128
"version": "1.0.0",
105129
"depth": 0,
106130
"source": "builtin",
107131
"dependencies": {
108-
"com.unity.modules.ui": "1.0.0"
132+
"com.unity.modules.ui": "1.0.0",
133+
"com.unity.modules.imgui": "1.0.0"
109134
}
110135
},
111136
"com.unity.xr.legacyinputhelpers": {
112-
"version": "2.1.4",
137+
"version": "2.1.8",
113138
"depth": 1,
114139
"source": "registry",
115-
"dependencies": {},
140+
"dependencies": {
141+
"com.unity.modules.vr": "1.0.0",
142+
"com.unity.modules.xr": "1.0.0"
143+
},
116144
"url": "https://packages.unity.com"
117145
},
118146
"com.unity.xr.management": {
119-
"version": "3.2.13",
147+
"version": "4.0.1",
120148
"depth": 0,
121149
"source": "registry",
122150
"dependencies": {
123-
"com.unity.xr.legacyinputhelpers": "2.1.2",
151+
"com.unity.modules.subsystems": "1.0.0",
152+
"com.unity.modules.vr": "1.0.0",
153+
"com.unity.modules.xr": "1.0.0",
154+
"com.unity.xr.legacyinputhelpers": "2.1.7",
124155
"com.unity.subsystemregistration": "1.0.6"
125156
},
126157
"url": "https://packages.unity.com"
127158
},
128159
"com.unity.xr.oculus": {
129-
"version": "1.4.3",
160+
"version": "1.5.1",
130161
"depth": 0,
131162
"source": "registry",
132163
"dependencies": {
133-
"com.unity.xr.management": "3.0.6",
164+
"com.unity.xr.management": "3.2.13",
134165
"com.unity.ugui": "1.0.0"
135166
},
136167
"url": "https://packages.unity.com"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"MonoBehaviour": {
3+
"Version": 3,
4+
"EnableBurstCompilation": true,
5+
"EnableOptimisations": true,
6+
"EnableSafetyChecks": false,
7+
"EnableDebugInAllBuilds": false,
8+
"CpuMinTargetX32": 0,
9+
"CpuMaxTargetX32": 0,
10+
"CpuMinTargetX64": 0,
11+
"CpuMaxTargetX64": 0
12+
}
13+
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 61
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_ScopedRegistriesSettingsExpanded: 1
16+
oneTimeWarningShown: 0
17+
m_Registries:
18+
- m_Id: main
19+
m_Name:
20+
m_Url: https://packages.unity.com
21+
m_Scopes: []
22+
m_IsDefault: 1
23+
- m_Id: scoped:OpenUPM
24+
m_Name: OpenUPM
25+
m_Url: https://package.openupm.com
26+
m_Scopes:
27+
- com.de-panther
28+
- com.atteneder
29+
m_IsDefault: 0
30+
m_UserSelectedRegistryName:
31+
m_UserAddingNewScopedRegistry: 0
32+
m_RegistryInfoDraft:
33+
m_ErrorMessage:
34+
m_Original:
35+
m_Id: scoped:OpenUPM
36+
m_Name: OpenUPM
37+
m_Url: https://package.openupm.com
38+
m_Scopes:
39+
- com.de-panther
40+
- com.atteneder
41+
m_IsDefault: 0
42+
m_Modified: 0
43+
m_Name: OpenUPM
44+
m_Url: https://package.openupm.com
45+
m_Scopes:
46+
- com.de-panther
47+
- com.atteneder
48+
m_SelectedScopeIndex: 0

DebugProjects/Unity2019.4/ProjectSettings/ProjectSettings.asset

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ PlayerSettings:
6666
androidRenderOutsideSafeArea: 1
6767
androidUseSwappy: 0
6868
androidBlitType: 0
69+
androidResizableWindow: 0
70+
androidDefaultWindowWidth: 1920
71+
androidDefaultWindowHeight: 1080
72+
androidMinimumWindowWidth: 400
73+
androidMinimumWindowHeight: 300
74+
androidFullscreenMode: 1
6975
defaultIsNativeResolution: 1
7076
macRetinaSupport: 1
7177
runInBackground: 1
@@ -231,6 +237,7 @@ PlayerSettings:
231237
metalEditorSupport: 1
232238
metalAPIValidation: 1
233239
iOSRenderExtraFrameOnPause: 0
240+
iosCopyPluginsCodeInsteadOfSymlink: 0
234241
appleDeveloperTeamID:
235242
iOSManualSigningProvisioningProfileID:
236243
tvOSManualSigningProvisioningProfileID:
@@ -244,6 +251,7 @@ PlayerSettings:
244251
templatePackageId: [email protected]
245252
templateDefaultScene: Assets/Scenes/SampleScene.unity
246253
AndroidTargetArchitectures: 1
254+
AndroidTargetDevices: 0
247255
AndroidSplashScreenScale: 0
248256
androidSplashScreen: {fileID: 0}
249257
AndroidKeystoreName:
@@ -260,6 +268,7 @@ PlayerSettings:
260268
height: 180
261269
banner: {fileID: 0}
262270
androidGamepadSupportLevel: 0
271+
chromeosInputEmulation: 1
263272
AndroidValidateAppBundleSize: 1
264273
AndroidAppBundleSizeToValidate: 150
265274
m_BuildTargetIcons: []
@@ -376,6 +385,7 @@ PlayerSettings:
376385
switchTitleNames_12:
377386
switchTitleNames_13:
378387
switchTitleNames_14:
388+
switchTitleNames_15:
379389
switchPublisherNames_0:
380390
switchPublisherNames_1:
381391
switchPublisherNames_2:
@@ -391,6 +401,7 @@ PlayerSettings:
391401
switchPublisherNames_12:
392402
switchPublisherNames_13:
393403
switchPublisherNames_14:
404+
switchPublisherNames_15:
394405
switchIcons_0: {fileID: 0}
395406
switchIcons_1: {fileID: 0}
396407
switchIcons_2: {fileID: 0}
@@ -406,6 +417,7 @@ PlayerSettings:
406417
switchIcons_12: {fileID: 0}
407418
switchIcons_13: {fileID: 0}
408419
switchIcons_14: {fileID: 0}
420+
switchIcons_15: {fileID: 0}
409421
switchSmallIcons_0: {fileID: 0}
410422
switchSmallIcons_1: {fileID: 0}
411423
switchSmallIcons_2: {fileID: 0}
@@ -421,6 +433,7 @@ PlayerSettings:
421433
switchSmallIcons_12: {fileID: 0}
422434
switchSmallIcons_13: {fileID: 0}
423435
switchSmallIcons_14: {fileID: 0}
436+
switchSmallIcons_15: {fileID: 0}
424437
switchManualHTML:
425438
switchAccessibleURLs:
426439
switchLegalInformation:
@@ -483,6 +496,8 @@ PlayerSettings:
483496
switchSocketInitializeEnabled: 1
484497
switchNetworkInterfaceManagerInitializeEnabled: 1
485498
switchPlayerConnectionEnabled: 1
499+
switchUseMicroSleepForYield: 1
500+
switchMicroSleepForYieldTime: 25
486501
ps4NPAgeRating: 12
487502
ps4NPTitleSecret:
488503
ps4NPTrophyPackPath:
@@ -509,6 +524,7 @@ PlayerSettings:
509524
ps4ShareFilePath:
510525
ps4ShareOverlayImagePath:
511526
ps4PrivacyGuardImagePath:
527+
ps4ExtraSceSysFile:
512528
ps4NPtitleDatPath:
513529
ps4RemotePlayKeyAssignment: -1
514530
ps4RemotePlayKeyMappingDir:
@@ -551,9 +567,37 @@ PlayerSettings:
551567
ps4disableAutoHideSplash: 0
552568
ps4videoRecordingFeaturesUsed: 0
553569
ps4contentSearchFeaturesUsed: 0
570+
ps4CompatibilityPS5: 0
571+
ps4AllowPS5Detection: 0
572+
ps4GPU800MHz: 1
554573
ps4attribEyeToEyeDistanceSettingVR: 0
555574
ps4IncludedModules: []
556575
ps4attribVROutputEnabled: 0
576+
ps5ParamFilePath:
577+
ps5VideoOutPixelFormat: 0
578+
ps5VideoOutInitialWidth: 1920
579+
ps5VideoOutOutputMode: 1
580+
ps5BackgroundImagePath:
581+
ps5StartupImagePath:
582+
ps5Pic2Path:
583+
ps5StartupImagesFolder:
584+
ps5IconImagesFolder:
585+
ps5SaveDataImagePath:
586+
ps5SdkOverride:
587+
ps5BGMPath:
588+
ps5ShareOverlayImagePath:
589+
ps5NPConfigZipPath:
590+
ps5Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
591+
ps5UseResolutionFallback: 0
592+
ps5UseAudio3dBackend: 0
593+
ps5ScriptOptimizationLevel: 2
594+
ps5Audio3dVirtualSpeakerCount: 14
595+
ps5UpdateReferencePackage:
596+
ps5disableAutoHideSplash: 0
597+
ps5OperatingSystemCanDisableSplashScreen: 0
598+
ps5IncludedModules: []
599+
ps5SharedBinaryContentLabels: []
600+
ps5SharedBinarySystemFolders: []
557601
monoEnv:
558602
splashScreenBackgroundSourceLandscape: {fileID: 0}
559603
splashScreenBackgroundSourcePortrait: {fileID: 0}
@@ -581,10 +625,12 @@ PlayerSettings:
581625
managedStrippingLevel:
582626
WebGL: 1
583627
incrementalIl2cppBuild: {}
628+
suppressCommonWarnings: 1
584629
allowUnsafeCode: 0
585630
additionalIl2CppArgs:
586631
scriptingRuntimeVersion: 1
587632
gcIncremental: 0
633+
assemblyVersionValidation: 1
588634
gcWBarrierValidation: 0
589635
apiCompatibilityLevelPerPlatform: {}
590636
m_RenderingPath: 1
@@ -634,6 +680,7 @@ PlayerSettings:
634680
XboxOneCapability: []
635681
XboxOneGameRating: {}
636682
XboxOneIsContentPackage: 0
683+
XboxOneEnhancedXboxCompatibilityMode: 0
637684
XboxOneEnableGPUVariability: 1
638685
XboxOneSockets: {}
639686
XboxOneSplashScreen: {fileID: 0}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.7f1
2-
m_EditorVersionWithRevision: 2019.4.7f1 (e992b1a16e65)
1+
m_EditorVersion: 2019.4.33f1
2+
m_EditorVersionWithRevision: 2019.4.33f1 (c9b2b02eeeef)

MainProject/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"dependencies": {
13-
"com.de-panther.webxr-input-profiles-loader": "0.3.7",
13+
"com.de-panther.webxr-input-profiles-loader": "0.4.0",
1414
"com.unity.ide.rider": "2.0.7",
1515
"com.unity.ide.visualstudio": "2.0.8",
1616
"com.unity.ide.vscode": "1.2.3",

0 commit comments

Comments
 (0)