Commit bf4afcd
Merge branch 'main' into feat/explorer-ui-events-result
Resolves the conflicts main brought in with #1530 (audioEventSystem,
avatarEmoteCommand.state) and #1532 (jest 30, node >=24.16, dependency
slimming). Every conflict sat in a generated artifact, so main's side was
taken and the artifacts were regenerated instead of merged by hand.
@dcl/protocol moves off the PR tarball onto the published
1.0.0-31617402096.commit-86c4613, now that decentraland/protocol#455 is
merged. The development-dependency gate therefore no longer applies, and the
AvatarEmoteMask entry the experimental-based tarball dragged into
playground-assets.api.md is gone.
Lockfiles are regenerated with the Node version CI pins (24.16.0), which
drops the "libc" fields an older npm had written.
Co-Authored-By: Claude <noreply@anthropic.com>111 files changed
Lines changed: 7973 additions & 10440 deletions
File tree
- docs
- packages/@dcl
- ecs/src
- components/extended
- runtime/initialization
- systems
- playground-assets/etc
- react-ecs/src
- components
- InteractableArea
- ScreenInsetArea
- sdk-commands
- src
- commands
- code-to-composite
- deploy
- quests
- start
- server
- components
- logic
- sdk
- src
- scripts
- test
- build-ecs
- ecs
- components
- events
- react-ecs
- sdk-commands
- blackbox
- commands
- build
- init
- quests
- start
- utils
- sdk/network
- snapshots
- development-bundles
- production-bundles
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
| 113 | + | |
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
9 | 14 | | |
10 | 15 | | |
11 | 16 | | |
| |||
0 commit comments