Fireblade
ede54a1600
Merge remote-tracking branch 'upstream/main' into TU31
2026-07-05 18:32:31 -04:00
Langtanium
0476c307db
Fixed skin offset leak and removed skin item offset
...
Fixed DLC skin offset leak causing offsets from one skin to leak onto another skin. Removed skin item offset as the location it was previously added to did not have the desired result.
2026-06-22 15:17:01 -07:00
Langtanium
a24582da84
Added item offsets for DLC skins
...
Added item offsets for DLC skins and changed some more code in HumanoidModel.cpp
2026-06-22 15:14:53 -07:00
Fireblade
322d426868
feat: 3d skull
2026-05-27 21:49:11 -04:00
Fireblade
950de854a1
feat: barrier block
...
todo: deprecate *.col file usage
2026-04-29 16:35:14 -04:00
Tranqlmao
4b6e9f8eb2
Elytra
...
mfeat: added early access elytra in creative for bug testing/accuracy comparison
TODO: replace temporary atlas, Properly implement 3d skulls
2026-04-24 20:00:35 -04:00
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
Sylvessa
4e6c695899
fix: boat plr height & sneak height ( #1459 )
2026-04-05 16:08:17 -05:00
piebot
b3ac4411fe
Merge branch 'pr-1403'
2026-03-27 13:11:58 +03:00
piebot
74c197cc15
apparently the commits i did for glass pane didnt apply so
2026-03-26 20:41:29 +03:00
piebot
d73ae8fd5c
Fix Commit "Implement LCERenewed Changes"
...
This fixes commit cf0472117c
2026-03-26 17:57:03 +03:00
piebot
cf0472117c
Implement LCERenewed Changes
2026-03-26 14:14:42 +03:00
ryleu
f3915a0603
add support for linux clang cross compiles
2026-03-24 10:05:40 -05:00
Prakhar Sharma
379434097a
Fix witches' bottle color ( #1205 )
...
* fix: witches' bottle is now the right color
* fix: add condition if item has mutiple layers
2026-03-13 11:41:47 +00:00
Prakhar Sharma
445567ddf7
Fix witches' bottle color ( #1205 )
...
* fix: witches' bottle is now the right color
* fix: add condition if item has mutiple layers
2026-03-13 11:41:47 +00:00
ModMaker101
28614b922f
Modernize project codebase ( #906 )
...
* Fixed boats falling and a TP glitch #266
* Replaced every C-style cast with C++ ones
* Replaced every C-style cast with C++ ones
* Fixed boats falling and a TP glitch #266
* Updated NULL to nullptr and fixing some type issues
* Modernized and fixed a few bugs
- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.
* Fixing more conflicts
* Replace int loops with size_t and start work on overrides
* Add safety checks and fix a issue with vector going OOR
2026-03-08 18:08:36 -05:00
Ayush Thoren
a14a4542c9
Fix stale held item appearing when switching worlds ( #910 )
...
Signed-off-by: Ayush Thoren <ayushthoren@gmail.com >
2026-03-09 03:12:49 +08:00
Loki Rautio
087b7e7abf
Revert "Project modernization ( #630 )"
...
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a
2026-03-07 21:12:22 -06:00
ModMaker101
a9be52c41a
Project modernization ( #630 )
...
* Fixed boats falling and a TP glitch #266
* Replaced every C-style cast with C++ ones
* Replaced every C-style cast with C++ ones
* Fixed boats falling and a TP glitch #266
* Updated NULL to nullptr and fixing some type issues
* Modernized and fixed a few bugs
- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.
* Fixing more conflicts
* Replace int loops with size_t and start work on overrides
2026-03-08 09:56:03 +07:00
LetsGoAway
c517f31b3d
Update ItemInHandRenderer.cpp ( #418 )
2026-03-05 03:26:56 +07: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
void_17
119bff3514
Revert "shared_ptr -> std::shared_ptr"
...
This reverts commit 7074f35e4b
2026-03-02 17:37:16 +07:00
void_17
7ae0c13854
Revert "dynamic_pointer_cast -> std::dynamic_pointer_cast"
...
This reverts commit 07ad68bc15
2026-03-02 17:36:56 +07:00
void_17
07ad68bc15
dynamic_pointer_cast -> std::dynamic_pointer_cast
2026-03-02 17:10:34 +07:00
void_17
7074f35e4b
shared_ptr -> std::shared_ptr
...
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
2026-03-02 15:58:20 +07:00
daoge_cmd
b691c43c44
Initial commit
2026-03-01 12:16:08 +08:00
