George V.
506ebd2176
Merge remote-tracking branch 'itsRevela/main'
...
# Conflicts:
# .github/workflows/nightly.yml
# .gitignore
# Minecraft.Client/ChatScreen.cpp
# Minecraft.Client/ClientConnection.cpp
# Minecraft.Client/Common/Audio/SoundEngine.cpp
# Minecraft.Client/Common/Audio/SoundEngine.h
# Minecraft.Client/Common/Media/MediaWindows64.arc
# Minecraft.Client/Common/UI/IUIScene_HUD.cpp
# Minecraft.Client/Common/UI/UIControl_Base.cpp
# Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
# Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
# Minecraft.Client/Common/XUI/XUI_Chat.cpp
# Minecraft.Client/Common/XUI/XUI_Death.cpp
# Minecraft.Client/Font.cpp
# Minecraft.Client/Gui.cpp
# Minecraft.Client/PendingConnection.cpp
# Minecraft.Client/PlayerConnection.cpp
# Minecraft.Client/PlayerConnection.h
# Minecraft.Client/PlayerList.cpp
# Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
# Minecraft.Client/Windows64/Network/WinsockNetLayer.h
# Minecraft.Client/Windows64Media/strings.h
# Minecraft.Client/cmake/sources/Common.cmake
# Minecraft.Server/Console/ServerCliEngine.cpp
# Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp
# Minecraft.Server/Windows64/ServerMain.cpp
# Minecraft.World/WitherBoss.h
# Minecraft.World/cmake/sources/Common.cmake
# README.md
2026-04-09 15:21:43 +03:00
piebot
91203050fa
Implement red sand and red sandstone.
2026-03-14 23:21:19 +03:00
Revela
c3b204f77b
Fix Gui.cpp merge and enhance hardcore mode visuals
...
This commit adds new `NamedFrame` entries and `KeyFrame` animations in `skin_Minecraft.xui` for various hardcore game modes, improving the UI representation (likely will get rid of this since it's dead code). A new `isHardcore` variable in `XUI_HUD.cpp` allows for conditional health icon animations based on the game mode. Additionally, commented-out code in `Gui.cpp` has been removed to streamline rendering logic. Several new PNG images for health states in hardcore mode have also been added to enhance the user experience.
TL;DR: This commit is basically just prep for adding hardcore heathbar hearts while also fixing some breaking that occurred in Gui.cpp after a merge.
2026-03-13 11:11:21 -05:00
daoge
b3feddfef3
feat: TU19 (Dec 2014) Features & Content ( #155 )
...
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32 )
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com >
2026-03-03 03:04:10 +08:00
daoge_cmd
b691c43c44
Initial commit
2026-03-01 12:16:08 +08:00
