Skip to content

Commit fcfe507

Browse files
authored
Merge branch 'dev' into chore/sync
Signed-off-by: Fran Colarich <56565104+fcolarich@users.noreply.github.com>
2 parents 1f47da8 + 9a8e53f commit fcfe507

649 files changed

Lines changed: 1532 additions & 17471327 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.

.github/workflows/build-unitycloud.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,9 +346,7 @@ jobs:
346346
PARAM_BUILD_VERSION: ${{ needs.prebuild.outputs.version }}
347347
PARAM_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
348348
PARAM_SENTRY_ENVIRONMENT: ${{ needs.prebuild.outputs.sentry_environment }}
349-
PARAM_SENTRY_CLI_AUTH_TOKEN: ${{ secrets.SENTRY_CLI_AUTH_TOKEN }}
350349
PARAM_SENTRY_ENABLED: ${{ needs.prebuild.outputs.sentry_enabled }}
351-
PARAM_SENTRY_UPLOAD_DEBUG_SYMBOLS: ${{ needs.prebuild.outputs.sentry_upload_symbols }}
352350
PARAM_SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
353351
PARAM_INSTALL_SOURCE: ${{ needs.prebuild.outputs.install_source }}
354352
PARAM_UNITY_EXTRA_PARAMS: '-disable-assembly-updater'
@@ -558,6 +556,19 @@ jobs:
558556
build/**/*_BackUpThisFolder_ButDontShipItWithYourGame
559557
build/**/*_BurstDebugInformation_DoNotShip
560558
if-no-files-found: error
559+
560+
- name: Upload debug symbols to Sentry
561+
if: ${{ needs.prebuild.outputs.sentry_enabled == 'true' }}
562+
shell: bash
563+
env:
564+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_CLI_AUTH_TOKEN }}
565+
SENTRY_ORG: ${{ vars.SENTRY_ORG }}
566+
SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
567+
run: |
568+
npx --yes @sentry/cli debug-files upload \
569+
--org "$SENTRY_ORG" \
570+
--project "$SENTRY_PROJECT" \
571+
"build"
561572
562573
# Will run always (even if failing)
563574
- name: Upload cloud logs
@@ -598,4 +609,4 @@ jobs:
598609
API_KEY: ${{ secrets.UNITY_CLOUD_API_KEY }}
599610
ORG_ID: ${{ secrets.UNITY_CLOUD_ORG_ID }}
600611
PROJECT_ID: ${{ secrets.UNITY_CLOUD_PROJECT_ID }}
601-
run: python -u scripts/cloudbuild/build.py --cancel
612+
run: python -u scripts/cloudbuild/build.py --cancel

Explorer/Assets/DCL/ApplicationsGuards/ApplicationLivekitGuard/LivekitDownGuardPopup.prefab

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ MonoBehaviour:
104104
m_VerticalAlignment: 512
105105
m_textAlignment: 65535
106106
m_characterSpacing: 0
107+
m_characterHorizontalScale: 1
107108
m_wordSpacing: 0
108109
m_lineSpacing: 0
109110
m_lineSpacingMax: 0
@@ -280,6 +281,7 @@ MonoBehaviour:
280281
m_VerticalAlignment: 512
281282
m_textAlignment: 65535
282283
m_characterSpacing: 0
284+
m_characterHorizontalScale: 1
283285
m_wordSpacing: 0
284286
m_lineSpacing: 0
285287
m_lineSpacingMax: 0
@@ -901,6 +903,7 @@ MonoBehaviour:
901903
m_VerticalAlignment: 512
902904
m_textAlignment: 65535
903905
m_characterSpacing: 0
906+
m_characterHorizontalScale: 1
904907
m_wordSpacing: 0
905908
m_lineSpacing: 0
906909
m_lineSpacingMax: 0
@@ -1325,7 +1328,7 @@ MonoBehaviour:
13251328
m_OnCullStateChanged:
13261329
m_PersistentCalls:
13271330
m_Calls: []
1328-
m_Sprite: {fileID: 21300000, guid: 06a893a4f92c34c41b0d0c4efe0813ae, type: 3}
1331+
m_Sprite: {fileID: 21300000, guid: 90614bd3e9d404a50af4ebe6ddedd83b, type: 3}
13291332
m_Type: 0
13301333
m_PreserveAspect: 1
13311334
m_FillCenter: 1

Explorer/Assets/DCL/AvatarRendering/Emotes/EmbeddedEmotes/CommonEmotes/Clap.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Explorer/Assets/DCL/AvatarRendering/Emotes/EmbeddedEmotes/CommonEmotes/Clap/Clap_Emote.prefab

Lines changed: 0 additions & 75 deletions
This file was deleted.

Explorer/Assets/DCL/AvatarRendering/Emotes/EmbeddedEmotes/CommonEmotes/Clap/Clap_Emote.prefab.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

Explorer/Assets/DCL/AvatarRendering/Emotes/EmbeddedEmotes/CommonEmotes/Clap/Clapping_Particles.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Explorer/Assets/DCL/AvatarRendering/Emotes/EmbeddedEmotes/CommonEmotes/Clap/Clapping_Particles/Animator.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)