- Handle pre-login permission checks in offline/system-link mode when
Xbox Live is disabled (grant canPlay/canPlayLocal/friends permissions)
- Log Offline LAN handshake events (PreLogin/Login/GAME_PLAY state)
- Stub: set QNET_STATE_GAME_PLAY on SetGamePlayState and advertise the
session joinable when hosting
- PS3 postbuild: source the PS3 tutorial pack from the PS3 tree instead
of the PSVita tree so the big-endian PS3 DLC parser doesn't read a
little-endian pack as garbage (fixes RPCS3 boot crash in
DLCManager::processDLCDataFile)
Merge the upstream pieeebot/cafeberry networking branch into the local
networking branch, incorporating the rebased mainline work (PS3/PSVita
networking, large-worlds defines, media rebuilds, workflow CI, renamed
WinsockNetLayer->NetworkSocketLayer / PlatformNetworkManagerStub->
PlatformNetworkManager refactors).
Conflict resolutions:
- NetworkSocketLayer.cpp / PlatformNetworkManager.{h,cpp}: took the
remote's evolved implementations (connect retries, non-blocking
connect, smallId assignment, GAME_PLAY state handling in DoWork).
- PS3-postbuild.ps1: kept the remote's approach of disabling the
broken PSVita tutorial pack copy (softlocks game).
- Minecraft.Client.vcxproj: took the remote's restructured project.
The X360 offline-LAN pre-login grant (ClientConnection.cpp) is retained.
pieeebot
merged commit ebbd54288b into networking2026-08-07 17:14:13 +00:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
^
Merge the upstream pieeebot/cafeberry networking branch into the local networking branch, incorporating the rebased mainline work (PS3/PSVita networking, large-worlds defines, media rebuilds, workflow CI, renamed WinsockNetLayer->NetworkSocketLayer / PlatformNetworkManagerStub-> PlatformNetworkManager refactors). Conflict resolutions: - NetworkSocketLayer.cpp / PlatformNetworkManager.{h,cpp}: took the remote's evolved implementations (connect retries, non-blocking connect, smallId assignment, GAME_PLAY state handling in DoWork). - PS3-postbuild.ps1: kept the remote's approach of disabling the broken PSVita tutorial pack copy (softlocks game). - Minecraft.Client.vcxproj: took the remote's restructured project. The X360 offline-LAN pre-login grant (ClientConnection.cpp) is retained.