Commit graph

12 commits

Author SHA1 Message Date
kuwacom 83063f4b73 Merge origin/main into feature/dedicated-server
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.
2026-03-07 19:39:52 +09:00
FriedMonkey a6699a2e6f
Fixed baby zombie hitbox size (#765)
* 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>
2026-03-06 18:45:22 -06:00
Vincent Zhang d4db0b947f
Add Adventure Mode as an option when creating world (#757)
* 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
2026-03-06 18:37:11 -06:00
kuwacom 06bff53e4d add: add Docker support for Dedicated Server
add with entrypoint and build scripts
2026-03-06 21:38:43 +09:00
Vincent Zhang 73cc345f54
Add a launch argument for full screen (#663)
* 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
2026-03-05 22:54:30 -06:00
kuwacom e4c8229e52 add: Dedicated Server implementation
- Introduced `ServerMain.cpp` for the dedicated server logic, handling command-line arguments, server initialization, and network management.
- Created `postbuild_server.ps1` script for post-build tasks, including copying necessary resources and DLLs for the dedicated server.
- Added `CopyServerAssets.cmake` to manage the copying of server assets during the build process, ensuring required files are available for the dedicated server.
- Defined project filters in `Minecraft.Server.vcxproj.filters` for better organization of server-related files.
2026-03-04 18:12:26 +09:00
St4lker0k765 15129932da
Add saves folder to .gitignore (#184) 2026-03-03 06:26:20 +07:00
rtm516 e15bd26917
Move to a postbuild.ps1 script and set the working dir at runtime as output dir (#113)
* Move to a postbuild.ps1 script and Set the working dir at runtime as output dir

* Update for 2f711d4

* Only copy newer files and remove needed files from gitignore
2026-03-02 15:14:14 +07:00
isaiah 5109b8c07a Add CMake build system and source files for Minecraft Client
- Created Compile.md with detailed instructions for building the project using Visual Studio and CMake.
- Added ClientSources.cmake to define the source files for the Minecraft Client.
- Implemented CopyAssets.cmake to handle asset copying during the build process.
- Introduced WorldSources.cmake to list the source files for Minecraft world functionalities.
2026-03-01 15:47:31 -07:00
rtm516 8c79598b01
Remove GameHDD save data and update .gitignore 2026-03-01 19:32:26 +00:00
Slenderman a2bcce6426 fix my cast and put it into a separate function 2026-03-01 14:22:01 -05:00
rtm516 05ea5ca043
Add gitignore (#17)
* Add gitignore

* Use some of the stuff from #13
2026-03-02 00:45:30 +08:00