Skip to content
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.

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

feat: enforce latest version #1954

Merged
merged 33 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8fc0b11
wip on showing popup
popuz Aug 29, 2024
b203f7c
wip on creating MVC UI
popuz Aug 29, 2024
489ecb6
wip on popup
popuz Aug 30, 2024
54ee70a
run launcher when version is not up-to-date
popuz Aug 30, 2024
97a8515
showing UI for re-direction
popuz Sep 2, 2024
ced3505
add references in scene and addressables
popuz Sep 2, 2024
bc70638
changed to be overlayed
popuz Sep 2, 2024
fa6eb3a
stop Bootstrap if version update is needed
popuz Sep 2, 2024
06e9d3b
Merge remote-tracking branch 'refs/remotes/origin/main' into feat/enf…
popuz Sep 2, 2024
cef27dc
Merge branch 'main' into feat/enforce-latest-version
popuz Sep 2, 2024
a4cbb8c
fixed localization issues
popuz Sep 2, 2024
4d99b02
Merge remote-tracking branch 'origin/feat/enforce-latest-version' int…
popuz Sep 2, 2024
55387d3
Merge branch 'refs/heads/main' into feat/enforce-latest-version
popuz Sep 2, 2024
5acdb85
moved to separate folder
popuz Sep 2, 2024
2b680a4
add re-directing to Launcher download if doesn't exist
popuz Sep 2, 2024
ec696e1
small refactoring
popuz Sep 2, 2024
89c23a3
Merge branch 'main' into feat/enforce-latest-version
popuz Sep 2, 2024
5b4b75e
fixed code convention test
popuz Sep 2, 2024
e97692b
Merge remote-tracking branch 'origin/feat/enforce-latest-version' int…
popuz Sep 2, 2024
bc126a3
merged main and resolved conflicts
popuz Sep 16, 2024
f3042be
reverted dynamic settings to not show Guard for editor mode
popuz Sep 16, 2024
ecbc527
apply most of the requested changes
popuz Sep 16, 2024
51143b3
handled Debug builds
popuz Sep 16, 2024
803321d
small fix for debug mode
popuz Sep 16, 2024
241b213
add simulation of version for QA to test
popuz Sep 16, 2024
85da539
Merge branch 'main' into feat/enforce-latest-version
popuz Sep 16, 2024
1ffeb0b
Merge branch 'main' into feat/enforce-latest-version
popuz Sep 16, 2024
ea461b5
Merge branch 'main' into feat/enforce-latest-version
popuz Sep 16, 2024
bf96b31
fixed validation test
popuz Sep 16, 2024
ecc8f28
Merge branch 'main' into feat/enforce-latest-version
popuz Sep 16, 2024
0780bd3
handled Process.Start
popuz Sep 17, 2024
bcb4afb
Merge remote-tracking branch 'origin/feat/enforce-latest-version' int…
popuz Sep 17, 2024
a432655
Merge branch 'main' into feat/enforce-latest-version
popuz Sep 17, 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
117 changes: 61 additions & 56 deletions Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
Original file line number Diff line number Diff line change
Expand Up @@ -17,48 +17,53 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 9d34671c4a9995044aa4b38f0c1c3570
m_SerializeEntries:
- m_GUID: 8fd0fd0188702304689c461c6aacc7c5
m_Address: HoverCanvas
- m_GUID: 028bf9eb42404424bbd1df5cd802720e
m_Address: FullSearchResult
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7dc631660587a41589ba55c08ff7fa73
m_Address: ExplorePanel
- m_GUID: 1c359f0bee710da4fa6342a37ca26ae8
m_Address: LogoDCL154x154SpriteAtlas.spriteatlas
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ad0eada9babef44e5bb3f06b080eef83
m_Address: Navmap
- m_GUID: 2044c17e0fa1b3f4d9d2d3a25cfa77de
m_Address: MapRendererSettings
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f2ef3a867ab2840cb9bc73b4762922fd
m_Address: Minimap
- m_GUID: 25307fc8924cf8747a2b0fd87a729aca
m_Address: M_LoadingSpinnerBackground.mat
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 028bf9eb42404424bbd1df5cd802720e
m_Address: FullSearchResult
- m_GUID: 2668240d360264034b2ee70e645aab92
m_Address: Assets/DCL/UI/ColorPicker/HairColors.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e0f5a4ab5d8f74640ae94adb6824bd45
m_Address: ScenesUIRootCanvas
- m_GUID: 295cf8ad8d171d849863eccaf581c9e7
m_Address: ScenesUIStyleSheet
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 295cf8ad8d171d849863eccaf581c9e7
m_Address: ScenesUIStyleSheet
- m_GUID: 37b740e9dd5ba324c91cd05632ea002c
m_Address: TeleportPrompt
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 809b68e5ce75da1429e55ffcc44fa23b
m_Address: ExternalUrlPrompt
- m_GUID: 506fef2fcce22b54ba4571ced3af5dc6
m_Address: LoadingAtlast.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 37b740e9dd5ba324c91cd05632ea002c
m_Address: TeleportPrompt
- m_GUID: 5af318126b38647fea34ff22fba4ef17
m_Address: Assets/DCL/UI/ColorPicker/BodyShapeColors.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 67c43eeeaf9c34744807086742498bf8
m_Address: BackpackAtlas.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
Expand All @@ -67,98 +72,98 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d504e2da7abe71a4582c8c2e08e3c285
m_Address: NftPrompt
- m_GUID: 6dfe28bda416549a9b6598e822044ba1
m_Address: CommonTexturesAtlas.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: dbfb7e67a438449f9a887f820f733868
m_Address: Assets/DCL/UI/Popups/PopupCloser.prefab
- m_GUID: 73b47c88148e7a14f9ea5e351d2d792d
m_Address: Assets/DCL/MapRenderer/Textures/MapRenderer.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5af318126b38647fea34ff22fba4ef17
m_Address: Assets/DCL/UI/ColorPicker/BodyShapeColors.asset
- m_GUID: 7dc631660587a41589ba55c08ff7fa73
m_Address: ExplorePanel
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a00387527d7ddda41b9eb524b4a8662c
m_Address: Assets/DCL/UI/ColorPicker/EyesColors.asset
- m_GUID: 809b68e5ce75da1429e55ffcc44fa23b
m_Address: ExternalUrlPrompt
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2668240d360264034b2ee70e645aab92
m_Address: Assets/DCL/UI/ColorPicker/HairColors.asset
- m_GUID: 8fd0fd0188702304689c461c6aacc7c5
m_Address: HoverCanvas
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: bf1104b23d6ed8f4ab84e9a0da93e10d
m_Address: Passport
- m_GUID: a00387527d7ddda41b9eb524b4a8662c
m_Address: Assets/DCL/UI/ColorPicker/EyesColors.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c7887090193b1ec4c994ad22169b86db
m_Address: MainUIContainer
- m_GUID: ad0eada9babef44e5bb3f06b080eef83
m_Address: Navmap
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: eb94acb2812554e4695a383fa2eae4b7
m_Address: PinMarkerObject_Destination Variant
- m_GUID: bdd6d1e45d38dbc44b593240a7768188
m_Address: EmoteIconPressedSpriteAtlas.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2044c17e0fa1b3f4d9d2d3a25cfa77de
m_Address: MapRendererSettings
- m_GUID: bf1104b23d6ed8f4ab84e9a0da93e10d
m_Address: Passport
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d2b6974d311b52d418b15738f4ef38dc
m_Address: Authentication.spriteatlas
- m_GUID: c522d0b7573224f59a5c1fde68c734e3
m_Address: PersistentEmoteWheelOpener.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1c359f0bee710da4fa6342a37ca26ae8
m_Address: LogoDCL154x154SpriteAtlas.spriteatlas
- m_GUID: c77c82b7631304e47a8c0ba64982cebb
m_Address: M_ChargeBarV2.mat
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: bdd6d1e45d38dbc44b593240a7768188
m_Address: EmoteIconPressedSpriteAtlas.spriteatlasv2
- m_GUID: c7887090193b1ec4c994ad22169b86db
m_Address: MainUIContainer
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 25307fc8924cf8747a2b0fd87a729aca
m_Address: M_LoadingSpinnerBackground.mat
- m_GUID: d2b6974d311b52d418b15738f4ef38dc
m_Address: Authentication.spriteatlas
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c77c82b7631304e47a8c0ba64982cebb
m_Address: M_ChargeBarV2.mat
- m_GUID: d504e2da7abe71a4582c8c2e08e3c285
m_Address: NftPrompt
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 67c43eeeaf9c34744807086742498bf8
m_Address: BackpackAtlas.spriteatlasv2
- m_GUID: dbfb7e67a438449f9a887f820f733868
m_Address: Assets/DCL/UI/Popups/PopupCloser.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 73b47c88148e7a14f9ea5e351d2d792d
m_Address: Assets/DCL/MapRenderer/Textures/MapRenderer.spriteatlasv2
- m_GUID: e0f5a4ab5d8f74640ae94adb6824bd45
m_Address: ScenesUIRootCanvas
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 506fef2fcce22b54ba4571ced3af5dc6
m_Address: LoadingAtlast.spriteatlasv2
- m_GUID: eb94acb2812554e4695a383fa2eae4b7
m_Address: PinMarkerObject_Destination Variant
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6dfe28bda416549a9b6598e822044ba1
m_Address: CommonTexturesAtlas.spriteatlasv2
- m_GUID: f2df2b2c3721c5840b06c8fe73d5d665
m_Address: VersionUpdateScreen
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c522d0b7573224f59a5c1fde68c734e3
m_Address: PersistentEmoteWheelOpener.prefab
- m_GUID: f2ef3a867ab2840cb9bc73b4762922fd
m_Address: Minimap
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
Expand Down
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/ApplicationVersionGuard.meta

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
@@ -0,0 +1,22 @@
{
"name": "ApplicationVersionGuard",
"rootNamespace": "",
"references": [
"GUID:4a12c0b1b77ec6b418a8d7bd5c925be3",
"GUID:0b3eab7834a09c24ca4e84fe0d8a43ce",
"GUID:45f6fff651a0a514f8edfdaf9cce45af",
"GUID:f51ebe6a0ceec4240a699833d6309b23",
"GUID:6055be8ebefd69e48b49212b09b47b2f",
"GUID:101b8b6ebaf64668909b49c4b7a1420d",
"GUID:91cf8206af184dac8e30eb46747e9939"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

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

Loading
Loading