Skip to content

Commit

Permalink
Fix corruption with Quest screenshots (icosa-foundation#552)
Browse files Browse the repository at this point in the history
* Bump Unity version to see if it fixes the issue

* Unity's automatic changes to XR Package Settings

* Update input system fork

* misc project file updates

---------

Co-authored-by: Mike Nisbet <[email protected]>
  • Loading branch information
andybak and mikeskydev authored Oct 23, 2023
1 parent d214d25 commit 61c465b
Show file tree
Hide file tree
Showing 69 changed files with 1,568 additions and 123 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on: # yamllint disable-line rule:truthy
- "v*"

env:
UNITY_VERSION: "2021.3.16f1"
UNITY_VERSION: "2021.3.30f1"
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
Expand Down
10 changes: 9 additions & 1 deletion Assets/AddressableAssetsData/AddressableAssetSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 677cec2ce1ef8b5428e8380b98e780ba
m_CachedHash:
serializedVersion: 2
Hash: 4303d53b849fb06159dbca9e82eb6b6a
Hash: 2b7bea248e2793f7f7f356bce5824c4f
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
Expand Down Expand Up @@ -73,6 +73,14 @@ MonoBehaviour:
- {fileID: 11400000, guid: 25208916e01863d4b9f8b96ceb6ee7ff, type: 2}
- {fileID: 11400000, guid: af49b136567ee4645a343a7c80d2005e, type: 2}
- {fileID: 11400000, guid: 3ed81040fbcbe4a41b005c5191be0ed7, type: 2}
- {fileID: 11400000, guid: fafae1350b8e6e044980d2e066c397b9, type: 2}
- {fileID: 11400000, guid: 5bd7ddc2d7ad60441b8e23e02602c826, type: 2}
- {fileID: 11400000, guid: 5ff0cec3a3fae824cac5076181ed7515, type: 2}
- {fileID: 11400000, guid: 5591077cbc77f9449a1c1c3ae544a74f, type: 2}
- {fileID: 11400000, guid: ea30395bde565804981dbbe5eba5a2d8, type: 2}
- {fileID: 11400000, guid: 2de83983b4436b345a2c7457b7f51d0b, type: 2}
- {fileID: 11400000, guid: 39e2d84665e8d5c4ca68de8a2be822bb, type: 2}
- {fileID: 11400000, guid: 73724c687487b5c4097fb53e64a2a50d, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: c3db699227f8ee04eab8d0d9270c14a8
m_SerializeEntries:
- m_GUID: 41773f6ad7caab84fbf1ad0f6f96fe9b
m_Address: Assets_zh
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-Chinese (Simplified)
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-Chinese (Simplified)
m_Data:
m_SerializedData: []
m_GUID: e3c7e1095805f38428a330b8f2640c8b
m_SerializeEntries:
- m_GUID: 41773f6ad7caab84fbf1ad0f6f96fe9b
m_Address: Assets_zh
m_ReadOnly: 1
m_SerializedLabels:
- Locale-zh
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: ee4b9f2370bc37644a292ef766e437c2, type: 2}
- {fileID: 11400000, guid: ff7879ea95e1be34793f7c8e22456952, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: 8c619321f3eec7d4b88451120f8d17dd
m_SerializeEntries:
- m_GUID: b46c5d7742c1248488d720e3a0a9e475
m_Address: Assets_debug
m_ReadOnly: 1
m_SerializedLabels:
- Locale-debug
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-Debug
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-Debug
m_Data:
m_SerializedData: []
m_GUID: 1696ea4cd260f534ca4ddc3c5bbcb745
m_SerializeEntries:
- m_GUID: b46c5d7742c1248488d720e3a0a9e475
m_Address: Assets_debug
m_ReadOnly: 1
m_SerializedLabels:
- Locale-debug
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: aa81756bc04f31a47961011e15aecda3, type: 2}
- {fileID: 11400000, guid: b8d42d0764d369543a1952f5e1432a10, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: 42b854e15fb0c624dabec4f3e2a6331c
m_SerializeEntries:
- m_GUID: 288d6c12b8e2ac844879b0b92860c3f4
m_Address: Assets_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-English
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-English
m_Data:
m_SerializedData: []
m_GUID: 1d449fd1f724d4c42aff58cb69505008
m_SerializeEntries:
- m_GUID: 288d6c12b8e2ac844879b0b92860c3f4
m_Address: Assets_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: fce991259d3632d4b83c364f21ec50d9, type: 2}
- {fileID: 11400000, guid: 1538bee721a8fbb45999a2470f0bc2c0, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: c4f8bd3505b70154983c38d4cc63b4b8
m_SerializeEntries:
- m_GUID: 30b9ec52e78e3a344b908cbfce3ea407
m_Address: Assets_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-French
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-French
m_Data:
m_SerializedData: []
m_GUID: 6cef525f539134e439de204af7a31b2e
m_SerializeEntries:
- m_GUID: 30b9ec52e78e3a344b908cbfce3ea407
m_Address: Assets_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: cd345f05ad1cf9649a01ace8879b96bf, type: 2}
- {fileID: 11400000, guid: 58bfaa656b697214fb4a534f24c39422, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: 791b59b6e6f043c45bdf19100615e997
m_SerializeEntries:
- m_GUID: 881c4bfab93dccb4caa6d17d13d6ae3a
m_Address: Assets_de
m_ReadOnly: 1
m_SerializedLabels:
- Locale-de
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-German
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-German
m_Data:
m_SerializedData: []
m_GUID: 2ab88d7af7c4fde4eae90476d045fb1e
m_SerializeEntries:
- m_GUID: 881c4bfab93dccb4caa6d17d13d6ae3a
m_Address: Assets_de
m_ReadOnly: 1
m_SerializedLabels:
- Locale-de
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: a5898fb02f874ba4593f522252592336, type: 2}
- {fileID: 11400000, guid: fd9d495546f88e048819a6428d288c51, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: dba365da0c6ce5948a943a70792bd48c
m_SerializeEntries:
- m_GUID: a968012b190696a49bbe0314f4a802eb
m_Address: Assets_ja
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ja
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-Asset-Tables-Japanese
m_EditorClassIdentifier:
m_GroupName: Localization-Asset-Tables-Japanese
m_Data:
m_SerializedData: []
m_GUID: d7ef7d3456cfba54396a5c8e1608934a
m_SerializeEntries:
- m_GUID: a968012b190696a49bbe0314f4a802eb
m_Address: Assets_ja
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ja
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: a99318049abecb44d9165d3dde48554d, type: 2}
- {fileID: 11400000, guid: c4b8942bebeaadc4c93d187a628b61eb, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: b5f4568e268a3f94c9529a205810cad0
m_SerializeEntries:
- m_GUID: d178a80fc29d8e74ea7f87adf2ed7951
m_Address: Assets_ko
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ko
- Preload
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
m_SchemaSet:
Expand Down
Loading

0 comments on commit 61c465b

Please sign in to comment.