Skip to content

Commit c52166b

Browse files
lorux0lorux0
authored
Merge pull request #5614 from decentraland/release/release-20230818
release: 20230818
2 parents 4c182e2 + abd6761 commit c52166b

File tree

83 files changed

+1896
-869
lines changed

Some content is hidden

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

83 files changed

+1896
-869
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ jobs:
302302
bash ci-playmode-test.sh
303303
exit $?
304304
fi;
305-
no_output_timeout: 30m
305+
no_output_timeout: 40m
306306
- run:
307307
name: nunit-to-junit
308308
when: always

‎browser-interface/packages/lib/decentraland/sceneJson/isSceneFeatureToggleEnabled.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { SceneFeatureToggle } from './types'
33

44
export function isSceneFeatureToggleEnabled(toggle: SceneFeatureToggle, sceneJsonData?: Scene): boolean {
55
const featureToggles = sceneJsonData?.featureToggles
6-
let feature = featureToggles?.[toggle.name]
6+
let feature = featureToggles?.[toggle!.name]
77

88
if (!feature || (feature !== 'enabled' && feature !== 'disabled')) {
99
// If not set or value is invalid, then use default
10-
feature = toggle.default
10+
feature = toggle!.default
1111
}
1212

1313
return feature === 'enabled'

‎browser-interface/packages/lib/decentraland/sceneJson/types.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
import { Scene } from '@dcl/schemas'
2+
3+
type FeatureToggles = NonNullable<Scene['featureToggles']>
4+
15
export type SceneFeatureToggle = {
2-
name: string
3-
default: 'enabled' | 'disabled'
4-
}
6+
[K in keyof FeatureToggles]: {
7+
name: K
8+
default: FeatureToggles[K]
9+
}
10+
}[keyof FeatureToggles]

‎browser-interface/packages/shared/types.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable @typescript-eslint/ban-types */
22
import type { Vector3 } from 'lib/math/Vector3'
33
import type { Vector2 } from 'lib/math/Vector2'
4+
import { SceneFeatureToggle } from 'lib/decentraland/sceneJson/types'
45
import { Entity } from '@dcl/schemas'
56
import { MinimapSceneInfo } from '@dcl/legacy-ecs/dist/decentraland/Types'
67
export type { WearableId, Wearable, WearableV2 } from './catalogs/types'
@@ -177,11 +178,6 @@ export type SceneSourcePlacement = {
177178
layout: { cols: number; rows: number }
178179
}
179180

180-
export type SceneFeatureToggle = {
181-
name: string
182-
default: 'enabled' | 'disabled'
183-
}
184-
185181
export const VOICE_CHAT_FEATURE_TOGGLE: SceneFeatureToggle = { name: 'voiceChat', default: 'enabled' }
186182

187183
export type LoadableScene = {

‎unity-renderer/Assets/DCLFeatures/CameraReel/CameraReel.asmdef‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
"GUID:4d7712e4b2446440a8af21fd3ce8690e",
2727
"GUID:d076a2c146613441bb926f5b49a88a9f",
2828
"GUID:6426fc92c49cbb342916620a1009be8d",
29-
"GUID:fd6a19eb8dfe417a84a27e537222d98d"
29+
"GUID:fd6a19eb8dfe417a84a27e537222d98d",
30+
"GUID:4720e174f2805c74bb7aa94cc8bb5bf8",
31+
"GUID:99cea83ca76dcd846abed7e61a8c90bd",
32+
"GUID:6e9be8e4a71701b48b60c8881e27a0e3"
3033
],
3134
"includePlatforms": [],
3235
"excludePlatforms": [],

‎unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/GalleryView.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@ MonoBehaviour:
645645
showMoreButtonPanel: {fileID: 4290208090933550867}
646646
canvas: {fileID: 2452549162064602847}
647647
emptyStateContainer: {fileID: 8552701980970885336}
648+
scrollMaskTransform: {fileID: 8598900832005062844}
648649
monthHeaderPrefab: {fileID: 816142868648288106, guid: 4631d5288231697489b884df705df08e,
649650
type: 3}
650651
monthGridContainerPrefab: {fileID: 6408376535620168257, guid: ec6e563cf5a659e4c8d81d46d9a8eec2,

‎unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/Loading.anim‎

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Loading
10+
serializedVersion: 6
11+
m_Legacy: 1
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves:
20+
- curve:
21+
serializedVersion: 2
22+
m_Curve:
23+
- serializedVersion: 3
24+
time: 0
25+
value: -345
26+
inSlope: 0
27+
outSlope: 0
28+
tangentMode: 136
29+
weightedMode: 0
30+
inWeight: 0.33333334
31+
outWeight: 0.33333334
32+
- serializedVersion: 3
33+
time: 1.8333334
34+
value: 354
35+
inSlope: 0
36+
outSlope: 0
37+
tangentMode: 136
38+
weightedMode: 0
39+
inWeight: 0.33333334
40+
outWeight: 0.33333334
41+
m_PreInfinity: 2
42+
m_PostInfinity: 2
43+
m_RotationOrder: 4
44+
attribute: m_AnchoredPosition.x
45+
path: Bright
46+
classID: 224
47+
script: {fileID: 0}
48+
- curve:
49+
serializedVersion: 2
50+
m_Curve:
51+
- serializedVersion: 3
52+
time: 0
53+
value: -77.90999
54+
inSlope: 0
55+
outSlope: 0
56+
tangentMode: 136
57+
weightedMode: 0
58+
inWeight: 0
59+
outWeight: 0
60+
m_PreInfinity: 2
61+
m_PostInfinity: 2
62+
m_RotationOrder: 4
63+
attribute: m_SizeDelta.x
64+
path: Bright
65+
classID: 224
66+
script: {fileID: 0}
67+
- curve:
68+
serializedVersion: 2
69+
m_Curve:
70+
- serializedVersion: 3
71+
time: 0
72+
value: 0
73+
inSlope: 0
74+
outSlope: 0
75+
tangentMode: 136
76+
weightedMode: 0
77+
inWeight: 0.33333334
78+
outWeight: 0.33333334
79+
- serializedVersion: 3
80+
time: 1.8333334
81+
value: 0
82+
inSlope: 0
83+
outSlope: 0
84+
tangentMode: 136
85+
weightedMode: 0
86+
inWeight: 0.33333334
87+
outWeight: 0.33333334
88+
m_PreInfinity: 2
89+
m_PostInfinity: 2
90+
m_RotationOrder: 4
91+
attribute: m_AnchoredPosition.y
92+
path: Bright
93+
classID: 224
94+
script: {fileID: 0}
95+
m_PPtrCurves: []
96+
m_SampleRate: 60
97+
m_WrapMode: 2
98+
m_Bounds:
99+
m_Center: {x: 0, y: 0, z: 0}
100+
m_Extent: {x: 0, y: 0, z: 0}
101+
m_ClipBindingConstant:
102+
genericBindings: []
103+
pptrCurveMapping: []
104+
m_AnimationClipSettings:
105+
serializedVersion: 2
106+
m_AdditiveReferencePoseClip: {fileID: 0}
107+
m_AdditiveReferencePoseTime: 0
108+
m_StartTime: 0
109+
m_StopTime: 1.8333334
110+
m_OrientationOffsetY: 0
111+
m_Level: 0
112+
m_CycleOffset: 0
113+
m_HasAdditiveReferencePose: 0
114+
m_LoopTime: 1
115+
m_LoopBlend: 0
116+
m_LoopBlendOrientation: 0
117+
m_LoopBlendPositionY: 0
118+
m_LoopBlendPositionXZ: 0
119+
m_KeepOriginalOrientation: 0
120+
m_KeepOriginalPositionY: 1
121+
m_KeepOriginalPositionXZ: 0
122+
m_HeightFromFeet: 0
123+
m_Mirror: 0
124+
m_EditorCurves:
125+
- curve:
126+
serializedVersion: 2
127+
m_Curve:
128+
- serializedVersion: 3
129+
time: 0
130+
value: -345
131+
inSlope: 0
132+
outSlope: 0
133+
tangentMode: 136
134+
weightedMode: 0
135+
inWeight: 0.33333334
136+
outWeight: 0.33333334
137+
- serializedVersion: 3
138+
time: 1.8333334
139+
value: 354
140+
inSlope: 0
141+
outSlope: 0
142+
tangentMode: 136
143+
weightedMode: 0
144+
inWeight: 0.33333334
145+
outWeight: 0.33333334
146+
m_PreInfinity: 2
147+
m_PostInfinity: 2
148+
m_RotationOrder: 4
149+
attribute: m_AnchoredPosition.x
150+
path: Bright
151+
classID: 224
152+
script: {fileID: 0}
153+
- curve:
154+
serializedVersion: 2
155+
m_Curve:
156+
- serializedVersion: 3
157+
time: 0
158+
value: -77.90999
159+
inSlope: 0
160+
outSlope: 0
161+
tangentMode: 136
162+
weightedMode: 0
163+
inWeight: 0
164+
outWeight: 0
165+
m_PreInfinity: 2
166+
m_PostInfinity: 2
167+
m_RotationOrder: 4
168+
attribute: m_SizeDelta.x
169+
path: Bright
170+
classID: 224
171+
script: {fileID: 0}
172+
- curve:
173+
serializedVersion: 2
174+
m_Curve:
175+
- serializedVersion: 3
176+
time: 0
177+
value: 0
178+
inSlope: 0
179+
outSlope: 0
180+
tangentMode: 136
181+
weightedMode: 0
182+
inWeight: 0.33333334
183+
outWeight: 0.33333334
184+
- serializedVersion: 3
185+
time: 1.8333334
186+
value: 0
187+
inSlope: 0
188+
outSlope: 0
189+
tangentMode: 136
190+
weightedMode: 0
191+
inWeight: 0.33333334
192+
outWeight: 0.33333334
193+
m_PreInfinity: 2
194+
m_PostInfinity: 2
195+
m_RotationOrder: 4
196+
attribute: m_AnchoredPosition.y
197+
path: Bright
198+
classID: 224
199+
script: {fileID: 0}
200+
m_EulerEditorCurves: []
201+
m_HasGenericRootTransform: 0
202+
m_HasMotionFloatCurves: 0
203+
m_Events: []

‎unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/Loading.anim.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.

0 commit comments

Comments
 (0)