Commit aa852ff
committed
Merge remote-tracking branch 'origin/dev' into darora1/218/ui-tour
Brings in Multiplayer v2 (Glueball). Nine files conflicted; several more
auto-merged across the same areas. Resolution decisions:
PreferenceTypes.ts
- Took dev's MultiplayerHost/Port/Secure and dropped MultiplayerClientID,
which dev deliberately removed in the v2 rewrite. Kept HasSeenOnboardingTour.
Synthesis.tsx
- Kept dev's Stack that groups DragModeIndicator with MultiplayerHUD, and
wrapped the tree in TourProvider with TourOverlay after PortraitOverlay.
MirabufLoader.ts / LibrarySpawnActions.ts
- This branch moved spawnCachedMira out to LibrarySpawnActions.ts, so dev's
edits to the old copy were ported by hand rather than merged:
- added the "Cannot spawn a second field!" guard for multiplayer sessions
- renamed newObject payload sceneObjectKey to sceneObjectId
- dropped the bodyIds payload field
- broadcast is no longer async, so broadcastSpawn no longer awaits it
- retargeted the import from multiplayer/types to multiplayer/MultiplayerTypes
- Kept dev's consolePrefixer logger in MirabufLoader.ts.
SceneRenderer.ts
- Kept both sides: this branch's captureAssemblyThumbnail and dev's optional
id parameter on registerSceneObject. Took dev's relocated
components/overlays/SceneOverlayEvents path.
MobileHUD.tsx (moved by dev to components/overlays/)
- Took dev's import paths for the new location and dev's globalOpenModal
multiplayer flow, which supersedes the startWorldCallback prop this branch
was passing. Kept LibraryModal in place of ImportMirabufPanel.
TopBar.tsx / ConfigurePanel.tsx
- Additive import unions only. Kept dev's setCloseModal and MatchModeType
alongside the tour imports.
ImportMirabufPanel.tsx
- Deleted. This branch replaced it with LibraryModal, and dev's only change to
it was an import path rewrite, so nothing behavioural was lost. No references
remain.
biome.json (only deliberate deviation from dev)
- Added an overrides entry disabling the linter and formatter for
src/systems/multiplayer/bindings, matching how src/proto is already handled.
dev's existing "!src/systems/multiplayer/bindings" sits in the formatter
includes only, so the generated glueball bindings were still linted and
formatted and blocked the pre-commit hook.
Verified after resolution: tsc clean, biome clean on source, 817 unit tests
pass, production build succeeds.126 files changed
Lines changed: 7487 additions & 1571 deletions
File tree
- .github
- actions/FissionSetup
- workflows
- docs
- multiplayer
- img
- fission
- .vite/deps
- src
- bench
- mirabuf
- systems
- analytics
- match_mode
- multiplayer
- physics
- preferences
- scene
- simulation/behavior/synthesis/drive
- test
- __snapshots__
- mirabuf
- multiplayer
- physics
- ui
- components
- overlays
- topbar
- helpers
- modals
- mirabuf
- multiplayer
- panels/configuring
- assembly-config
- interfaces
- initial-config
- util
- glueball
- .cargo
- bindings
- docs
- install
- src
- multiplayer
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
14 | 17 | | |
15 | 18 | | |
16 | 19 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | 20 | | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
| 21 | + | |
| 22 | + | |
35 | 23 | | |
36 | 24 | | |
37 | | - | |
38 | 25 | | |
39 | | - | |
40 | | - | |
41 | | - | |
| 26 | + | |
42 | 27 | | |
43 | 28 | | |
44 | | - | |
45 | 29 | | |
46 | | - | |
47 | | - | |
48 | | - | |
| 30 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | 15 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 16 | + | |
| 17 | + | |
33 | 18 | | |
34 | 19 | | |
35 | | - | |
36 | | - | |
37 | | - | |
| 20 | + | |
| 21 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
24 | 23 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
| 24 | + | |
38 | 25 | | |
39 | 26 | | |
40 | 27 | | |
| |||
44 | 31 | | |
45 | 32 | | |
46 | 33 | | |
| 34 | + | |
47 | 35 | | |
48 | | - | |
49 | 36 | | |
50 | 37 | | |
51 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
| 14 | + | |
| 15 | + | |
18 | 16 | | |
19 | 17 | | |
20 | 18 | | |
| |||
23 | 21 | | |
24 | 22 | | |
25 | 23 | | |
26 | | - | |
| 24 | + | |
27 | 25 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
35 | 29 | | |
36 | 30 | | |
37 | 31 | | |
38 | 32 | | |
39 | 33 | | |
40 | 34 | | |
41 | | - | |
| 35 | + | |
42 | 36 | | |
43 | 37 | | |
44 | 38 | | |
45 | 39 | | |
46 | 40 | | |
47 | 41 | | |
48 | 42 | | |
49 | | - | |
| 43 | + | |
50 | 44 | | |
51 | 45 | | |
52 | 46 | | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | 47 | | |
62 | | - | |
63 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
64 | 70 | | |
65 | 71 | | |
66 | 72 | | |
| |||
69 | 75 | | |
70 | 76 | | |
71 | 77 | | |
72 | | - | |
| 78 | + | |
73 | 79 | | |
74 | 80 | | |
75 | 81 | | |
| |||
80 | 86 | | |
81 | 87 | | |
82 | 88 | | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
| 89 | + | |
| 90 | + | |
87 | 91 | | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
| 92 | + | |
94 | 93 | | |
95 | | - | |
| 94 | + | |
96 | 95 | | |
| 96 | + | |
97 | 97 | | |
98 | | - | |
| 98 | + | |
99 | 99 | | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | 100 | | |
109 | 101 | | |
110 | 102 | | |
111 | 103 | | |
112 | 104 | | |
113 | 105 | | |
114 | 106 | | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
0 commit comments