Conflict resolution summary:
- .gitignore: kept dedicated-server-specific ignore entries (tmp*/, _server_asset_probe/, server-data/) and also kept main-side entries (*.user, /out).
- Minecraft.Client/Common/Network/GameNetworkManager.cpp: kept int64_t seed from main and preserved dedicatedNoLocalHostPlayer logic from dedicated-server.
- Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp: preserved dedicated-server shutdown flow and also included main-side cleanup for s_smallIdToSocketLock.
- Add client-side host disconnect handling in CPlatformNetworkManagerStub::DoWork() for _WINDOWS64.
- When in QNET_STATE_GAME_PLAY as a non-host and WinsockNetLayer::IsConnected() becomes false, trigger g_NetworkManager.HandleDisconnect(false) to enter the normal disconnect/UI flow.
- Use m_bLeaveGameOnTick as a one-shot guard to prevent repeated disconnect handling while the link remains down.
- Reset m_bLeaveGameOnTick on LeaveGame(), HostGame(), and JoinGame() to avoid stale state across sessions.
Before this change, server/host shutdown closed sockets directly in
ServerConnection::stop(), which bypassed the normal disconnect flow.
As a result, clients could be dropped without receiving a proper
DisconnectPacket during stop/kill/world-close paths.
Also, WinsockNetLayer::Shutdown() could destroy synchronization objects
while host-side recv threads were still exiting, causing a crash in
RecvThreadProc (access violation on world close in host mode).
- Integrated linenoise library for line editing and completion in the server console.
- Updated ServerLogger to handle external writes safely during logging.
- Modified ServerMain to initialize and manage the ServerCli for command input.
- The implementation is separate from everything else, so it doesn't affect anything else.
- The command input section and execution section are separated into threads.
The sounds Guglio was using were missing several sounds (skeleton damage, etc) as well as the "original" sound pack just being wrong. Switches back to the original sounds, though Miles was still louder somehow
Original sounds from Guglio - should be correct audio levels. Current sounds
were too quiet so swapping these for JE sounds will have to be done with
some sort of normalization level sampling thingie with ffmpeg or smthn
* Multiplayer 8 to max byte increase.
Made-with: Cursor
* Server chunk optimizations for large player counts, server full notification fix, added to server.properties.
* FOV option without debug menu
Now located in Graphics section.
Based on the FOV thing from discord idk
* language
* render distance option for graphics menu
* oop
* swf files on media
* revert changes on language selector
* nvm it was actually easy to fix
* forgot this
* Final probably
Fixed visual bug and made the chunk updates depend to your view distance.
* Fix DLCs textures and crash in 720p
* Revert "Fix DLCs textures and crash in 720p"
This reverts commit 7c38605360.
* Update Durango and Windows64 DLCs Textures also fix crash in 720p
* DLC update for Windows edition
- The windows edition dont use anymore DurangoMedia
- Fixed Bed and missing items in Skyrim
- Fixed Hud in almost all the DLCs (Halo hud in 720p is still the default hud)
- Add 720p support
- Add missing skin packs
- High quality Music for DLCs
* Add Fantasy Texture Pack, Remove LittleBigPlanet DLC
The LittleBigPlanet world crash the game, the texture pack dont support 1080p, and the loc file wasn't working
* Added scaling to zombie
i added scaling to zombie based on if its a baby or not
just setting the size does not work you have to set it in the tick (look at the tick for slimes which is a scalable monster)
* add output dir to gitignore
the build output folder is now added to the git ignore
---------
Co-authored-by: Loki <lokirautio@gmail.com>
* per user config should be .gitignored
* add comment surrounding gitignore update
* make it wildcard
* add fullscreen to launch option struct
* remove redundant forward declaration and use fullscreen launch option in main
* add adventure mode option as well as adjust cycling logic
* Revert deleting *.user from end of .gitignore
* rework comments
* Save FOV value to settings.dat
* Batch font drawing to fix debug overlay FPS
* Revert "Batch font drawing to fix debug overlay FPS"
This reverts commit 7dcecdbd4d.
It slowed down the code search significantly, so I had to manually cherry-pick assets and binary files from vscode search which made it much, much faster.
These cheats conflict with normal DPad behavior so they should be disabled.
If we want to reintroduce these, we'll need to find a better set of triggers
(and ideally respect server cheat settings) for allowing their use
Partially reverts changes in #682 that uses a better technique for rendering
the chat in favor of Iggy. We will need to go back once we update that
version for better visual parity with the Iggy chat rendering (position,
spacing, font size) but this works for now. Fixes#718
Loki Rautio