Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
3db7c2b
refactorings to support Multiplayer SDK session creation & joining by…
fernando-cortez Apr 5, 2024
2679102
feat: upgrade MPS SDK to 1.0.0
FabianStoll Oct 18, 2024
2cd4004
Merge branch 'test/multiplater-services-integration' into feat/conver…
FabianStoll Oct 21, 2024
e953e8a
feat: first batch conversion from Lobbies API to Multiplayer Services…
FabianStoll Oct 23, 2024
53a7b5b
feat: update exception handling
FabianStoll Oct 24, 2024
272d90d
fix: reintroduce client and host starting logic via NetworkManager wh…
FabianStoll Oct 24, 2024
e712f0b
fix: don't add user to local session when leaving the session
FabianStoll Oct 24, 2024
f23621f
fix: don't create a locked session
FabianStoll Oct 24, 2024
9416fb2
fix: create session logic
FabianStoll Oct 25, 2024
c919ba8
feat: rename lobby to session in char selection prefab
FabianStoll Oct 25, 2024
ccb005e
chore: batch renaming from lobby to session
FabianStoll Oct 25, 2024
623a424
fix: change rate limits
FabianStoll Oct 25, 2024
aeeee73
chore: remove obsolete comments
FabianStoll Oct 25, 2024
f47a14e
fix: prefab references
FabianStoll Oct 31, 2024
8b8fe74
feat: upgrade project version to 6000.0.24f1 and auto-upgrade packages
FabianStoll Oct 31, 2024
0861205
feat: auto-upgrade project settings and package assets
FabianStoll Oct 31, 2024
13be8af
feat: auto-upgrade assets
FabianStoll Oct 31, 2024
9e2d288
feat: upgrade project version to 6000.0.25f1
FabianStoll Oct 31, 2024
fcae286
feat: replace ParallelSync with Multiplayer Play Mode
FabianStoll Oct 31, 2024
47ededf
fix: failing test
FabianStoll Nov 5, 2024
1b0e387
feat: update Netcode for GameObjects to version 2.0.0
FabianStoll Nov 5, 2024
11b00cd
chore: update README
FabianStoll Nov 5, 2024
9018722
chore: changelog
FabianStoll Nov 5, 2024
d85cd2c
chore: add MPPM to changelog
FabianStoll Nov 5, 2024
b050a7e
test: add yamato test for U6
FabianStoll Nov 5, 2024
d1e1a32
fix: only test Unity 6
FabianStoll Nov 5, 2024
f78fcd2
fix: update ubuntu version for yamato
FabianStoll Nov 5, 2024
3ac4085
fix: update iOS image
FabianStoll Nov 5, 2024
8d724fa
Added a release mode configuration for iOS jobs
fluong6 Nov 5, 2024
0aadc39
Update CHANGELOG.md
FabianStoll Nov 7, 2024
fdf3041
fix: remove unneeded asset
FabianStoll Nov 7, 2024
4cd35c9
fix: show IET popup on startup
FabianStoll Nov 7, 2024
eddfc9d
fix: remove warnings about deprecated methods
FabianStoll Nov 7, 2024
308b377
feat: remove deprecated vscode package
FabianStoll Nov 7, 2024
f0db7d5
Merge branch 'feat/unity-6-upgrade' into feat/convert-to-multiplayer-…
FabianStoll Nov 7, 2024
931605c
fix: add services package again after merge
FabianStoll Nov 7, 2024
e313a92
chore: changelog
FabianStoll Nov 8, 2024
709c9e3
chore: readme changes
FabianStoll Nov 8, 2024
e24666d
fix: remove lobby and relay again
FabianStoll Nov 8, 2024
a6f89ea
fix: reset connection state when joining a session failed
FabianStoll Nov 12, 2024
11596b8
Merge branch 'develop' into feat/convert-to-multiplayer-services-sdk
FabianStoll Nov 20, 2024
9189356
chore: comment fix
FabianStoll Nov 21, 2024
3ec699e
chore: whitespace fixes
FabianStoll Nov 21, 2024
5c54677
chore: another whitespace fix
FabianStoll Nov 21, 2024
be84715
fix: revert tabs in comments that were added by auto-cleanup
FabianStoll Nov 26, 2024
90a0914
review: remove redundant async
FabianStoll Nov 26, 2024
e10079c
review: fix docs link
FabianStoll Nov 26, 2024
ff5f860
review: no need to unblock UI here
FabianStoll Nov 26, 2024
0a32dfb
review: remove unused fields
FabianStoll Nov 26, 2024
33ec786
review: remove todo
FabianStoll Nov 26, 2024
6e83731
review: remove unused method
FabianStoll Nov 26, 2024
780e631
review: specify MPS SDK version and PR number
FabianStoll Nov 26, 2024
69f62f1
review: update README.md
FabianStoll Nov 26, 2024
c3e4d0b
review: update changelog of package
FabianStoll Nov 26, 2024
931ee3d
fix: whitespaces
FabianStoll Nov 26, 2024
d3074e2
review: remove unneeded callback
FabianStoll Nov 27, 2024
93aa7d6
review: change readme
FabianStoll Nov 27, 2024
b49aea5
review: remove log
FabianStoll Nov 27, 2024
6ba2aee
review: split method for session joining
FabianStoll Nov 27, 2024
2885b34
fix: newline at end of file
FabianStoll Nov 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 141 additions & 3 deletions Assets/Prefabs/UI/MainMenu UI Canvas.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -359,15 +359,17 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
Expand Down Expand Up @@ -480,6 +482,10 @@ PrefabInstance:
propertyPath: m_fontSizeMax
value: 58
objectReference: {fileID: 0}
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_Name
value: IP Start Button
Expand Down Expand Up @@ -736,6 +742,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6068325059450104507}
m_Modifications:
- target: {fileID: 301174889687357229, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 709593810350336946, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 785373375347833033, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 792957857740898001, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -772,6 +790,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131054124500818674, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1583053172819472216, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2234904744820987572, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.x
value: 0
Expand Down Expand Up @@ -812,6 +838,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422802895906220296, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3523563153346996873, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3632019498769524828, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -852,6 +886,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4777870063691261607, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 4805371756271124143, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 5031063074198282838, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 5843186486647850782, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -868,6 +914,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6243726003260939195, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 6403041760458951094, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -886,7 +936,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6702871171647363808, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_Name
value: LobbyPopup
value: SessionPopup
objectReference: {fileID: 0}
- target: {fileID: 6702871171647363811, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_Pivot.x
Expand Down Expand Up @@ -992,6 +1042,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7486709167611836872, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7579639325911904033, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -1012,6 +1066,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7676773602323508701, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7878795380521772600, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -1028,6 +1086,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8349060408152716834, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -1058,9 +1120,13 @@ PrefabInstance:
propertyPath: m_fontSizeMax
value: 58
objectReference: {fileID: 0}
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_Name
value: Lobby Start Button
value: Session Start Button
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_IsActive
Expand Down Expand Up @@ -1222,6 +1288,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6068325059450104507}
m_Modifications:
- target: {fileID: 635758218034301578, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2425020540045722527, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: m_IPHostingUI
value:
Expand Down Expand Up @@ -1250,6 +1320,10 @@ PrefabInstance:
propertyPath: m_JoinTabButtonTabBlockerTinter
value:
objectReference: {fileID: 0}
- target: {fileID: 2632516940462403808, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2837639234489633647, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -1406,6 +1480,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6221418847513183700, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 8477078941156091232, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 8636502446461490653, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: m_AnchorMax.x
value: 0
Expand Down Expand Up @@ -1436,6 +1518,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6068325059450104507}
m_Modifications:
- target: {fileID: 142567138735162684, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 305241932145850641, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -1456,14 +1542,46 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 420772079678045107, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 496999993872493682, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_fontSize
value: 50
objectReference: {fileID: 0}
- target: {fileID: 496999993872493682, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1198809863901728126, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1724952364805774005, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_fontSize
value: 33
objectReference: {fileID: 0}
- target: {fileID: 1724952364805774005, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1887385345636018689, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1958720994042495195, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2267455651107791764, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3449200610800142136, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 4453893802180558433, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_AnchoredPosition.y
value: 58
Expand All @@ -1472,6 +1590,10 @@ PrefabInstance:
propertyPath: m_fontSize
value: 33
objectReference: {fileID: 0}
- target: {fileID: 5306707511080244411, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 5924530127146065184, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_Name
value: IPPopup
Expand Down Expand Up @@ -1560,10 +1682,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6456862980627209339, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7328528642576607773, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_fontSize
value: 50
objectReference: {fileID: 0}
- target: {fileID: 7328528642576607773, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7353534715922753761, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -1604,6 +1734,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8122071153592056310, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -1634,6 +1768,10 @@ PrefabInstance:
propertyPath: m_fontSizeMax
value: 58
objectReference: {fileID: 0}
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_Name
value: Profile Button
Expand Down
Loading