Skip to content

Commit

Permalink
Merge pull request #5897 from decentraland/release/release-20231106
Browse files Browse the repository at this point in the history
Release: 20231106
  • Loading branch information
anicalbano authored Nov 6, 2023
2 parents 09d9860 + b7aa0c5 commit e3ed246
Show file tree
Hide file tree
Showing 163 changed files with 15,894 additions and 1,904 deletions.
5 changes: 2 additions & 3 deletions .github/auto_assign_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ reviewGroups:
- sandrade-dcl
- lorux0
- davidejensen
- dalkia
- popuz
- Kinerius
- mikhail-dcl
- pravusjif
qa:
- kwssbocian
- kwsskulinski
- Ludmilafantaniella
- LucasLioyQA
- anicalbano

filterLabels:
Expand Down
4 changes: 3 additions & 1 deletion browser-interface/packages/shared/apis/host/Permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import type { PortContext } from './context'
export const defaultParcelPermissions: PermissionItem[] = [
PermissionItem.PI_USE_WEB3_API,
PermissionItem.PI_USE_FETCH,
PermissionItem.PI_USE_WEBSOCKET
PermissionItem.PI_USE_WEBSOCKET,
PermissionItem.PI_ALLOW_TO_MOVE_PLAYER_INSIDE_SCENE,
PermissionItem.PI_ALLOW_TO_TRIGGER_AVATAR_EMOTE
]
export const defaultPortableExperiencePermissions: PermissionItem[] = []

Expand Down
6 changes: 3 additions & 3 deletions browser-interface/packages/unity-interface/dcl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { traceDecoratorUnityGame } from './trace'
import defaultLogger from 'lib/logger'
import { ContentMapping, EntityType, Scene, sdk } from '@dcl/schemas'
import { ensureMetaConfigurationInitialized } from 'shared/meta'
import { reloadScenePortableExperience } from 'shared/portableExperiences/actions'
import { denyPortableExperiences, reloadScenePortableExperience } from 'shared/portableExperiences/actions'
import { wearableToSceneEntity } from 'shared/wearablesPortableExperience/sagas'
import { fetchScenesByLocation } from 'shared/scene-loader/sagas'
import { sleep } from 'lib/javascript/sleep'
Expand Down Expand Up @@ -149,7 +149,7 @@ export async function loadPreviewScene(message: sdk.Messages) {
}

if (message.type === sdk.SCENE_UPDATE && sdk.SceneUpdate.validate(message)) {
if (message.payload.sceneType === sdk.ProjectType.PORTABLE_EXPERIENCE) {
if ([sdk.ProjectType.PORTABLE_EXPERIENCE, 'smart-wearable'].includes(message.payload.sceneType)) {
try {
const { sceneId } = message.payload
const url = `${rootURLPreviewMode()}/preview-wearables/${sceneId}`
Expand All @@ -159,7 +159,7 @@ export async function loadPreviewScene(message: sdk.Messages) {
const wearable = collection.data[0]

const entity = await wearableToSceneEntity(wearable, wearable.baseUrl)

store.dispatch(denyPortableExperiences([]))
store.dispatch(reloadScenePortableExperience(entity))
}
} catch (err) {
Expand Down
14 changes: 7 additions & 7 deletions scripts/package-lock.json

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

2 changes: 1 addition & 1 deletion scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"typescript": "^4.2.3"
},
"dependencies": {
"@dcl/protocol": "^1.0.0-6590614146.commit-db4a595",
"@dcl/protocol": "^1.0.0-6725457366.commit-d6b2b77",
"@protobuf-ts/protoc": "^2.8.2",
"@types/fs-extra": "^11.0.1",
"@types/glob": "^8.0.1",
Expand Down
10 changes: 10 additions & 0 deletions unity-renderer/Assets/AddressableAssetsData/AssetGroups/HUDs.asset
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,32 @@ MonoBehaviour:
m_Address: SignupHUD
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8eeaa25ae02fb784e9b14ed71aae12f5
m_Address: HelpAndSupportHUD
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 987f12680f06c40d0a902d4004a36e3c
m_Address: NotificationHUD
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9945fbc075d76034b8836c6068943390
m_Address: WalletSectionHUD
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d73178a7da1894086b95f324c67f7d69
m_Address: ExperiencesConfirmationPopup
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 66b5961c332b383448f2a142ed0a3dea
m_Address: SignupHUDV2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 436e0d4fdc1cdfa4aaef13be2e8bcef8, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,47 @@ MonoBehaviour:
m_Address: MyAccountSectionHUD
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 99407e78aaf4f4651bbc1994d3727d5a
m_Address: ProfileCountries
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b9abce1a9234047fab509631245558ea
m_Address: ProfileEmploymentStatus
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 853a257eba7a74f4db47236ae49f29b4
m_Address: ProfileGenders
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6282385abcabb43899e02dc2c3640283
m_Address: ProfileLanguages
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a3bcd7e62b195469a9b3e1dcc1ee39b8
m_Address: ProfilePronouns
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2352ca3d532b4418ea29122f66f04d51
m_Address: ProfileRelationshipStatus
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 158b9f8b14ee641fab8eccc25b314376
m_Address: ProfileSexualOrientations
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2bc8f09d15597c54eafedcf481d7c2fa
m_Address: UpdateEmailConfirmationHUD
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 436e0d4fdc1cdfa4aaef13be2e8bcef8, type: 2}
m_SchemaSet:
Expand Down
Loading

0 comments on commit e3ed246

Please sign in to comment.