Skip to content

Commit 8442cff

Browse files
authored
Merge branch 'dev' into feat/nearby-voice-chat/audio-tracks-core
2 parents c3b0478 + 8267afb commit 8442cff

283 files changed

Lines changed: 1258550 additions & 10788 deletions

File tree

Some content is hidden

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

Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,6 @@ MonoBehaviour:
135135
m_ReadOnly: 0
136136
m_SerializedLabels: []
137137
FlaggedDuringContentUpdateRestriction: 0
138-
- m_GUID: 56a9743f8d94f684190dc11bb521fb78
139-
m_Address: Scene.shader
140-
m_ReadOnly: 0
141-
m_SerializedLabels: []
142-
FlaggedDuringContentUpdateRestriction: 0
143138
- m_GUID: 594ae6e7cd408424cb8433ddba60315d
144139
m_Address: Assets/DCL/Notifications/Assets/NotificationDefaultThumbnails.asset
145140
m_ReadOnly: 0

Explorer/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ MonoBehaviour:
2727
m_SerializedLabels:
2828
- Locale-en
2929
FlaggedDuringContentUpdateRestriction: 0
30+
- m_GUID: b6e9645ea90c9494a9ae8aba0ba9f004
31+
m_Address: Tests Localization Table_en
32+
m_ReadOnly: 1
33+
m_SerializedLabels:
34+
- Locale-en
35+
FlaggedDuringContentUpdateRestriction: 0
3036
- m_GUID: b983fc3744bd749df80bbb972f615bc9
3137
m_Address: UI Text Localization Table_en
3238
m_ReadOnly: 1

0 commit comments

Comments
 (0)