MatthewBeshay
|
a0fdc643d1
|
Merge branch 'upstream-dev' into cleanup/nullptr-replacement
# Conflicts:
# Minecraft.Client/Network/PlayerChunkMap.cpp
# Minecraft.Client/Network/PlayerList.cpp
# Minecraft.Client/Network/ServerChunkCache.cpp
# Minecraft.Client/Platform/Common/Consoles_App.cpp
# Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
# Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
# Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
# Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
# Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
# Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
# Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
# Minecraft.Client/Platform/Common/UI/UIController.cpp
# Minecraft.Client/Platform/Common/UI/UIController.h
# Minecraft.Client/Platform/Extrax64Stubs.cpp
# Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
# Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
# Minecraft.Client/Player/EntityTracker.cpp
# Minecraft.Client/Player/ServerPlayer.cpp
# Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
# Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
# Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
# Minecraft.Client/Textures/Stitching/TextureMap.cpp
# Minecraft.Client/Textures/Textures.cpp
# Minecraft.World/Blocks/NotGateTile.cpp
# Minecraft.World/Blocks/PressurePlateTile.cpp
# Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
# Minecraft.World/Enchantments/EnchantmentHelper.cpp
# Minecraft.World/Entities/HangingEntity.cpp
# Minecraft.World/Entities/LeashFenceKnotEntity.cpp
# Minecraft.World/Entities/LivingEntity.cpp
# Minecraft.World/Entities/Mobs/Boat.cpp
# Minecraft.World/Entities/Mobs/Minecart.cpp
# Minecraft.World/Entities/Mobs/Witch.cpp
# Minecraft.World/Entities/SyncedEntityData.cpp
# Minecraft.World/Items/LeashItem.cpp
# Minecraft.World/Items/PotionItem.cpp
# Minecraft.World/Level/BaseMobSpawner.cpp
# Minecraft.World/Level/CustomLevelSource.cpp
# Minecraft.World/Level/Level.cpp
# Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
# Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
# Minecraft.World/Level/Storage/RegionFileCache.cpp
# Minecraft.World/Player/Player.cpp
# Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
# Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
# Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
|
2026-03-30 16:28:40 +11:00 |
|
|
MatthewBeshay
|
dfb0e3b03e
|
refactor: replace NULL with nullptr across C++ codebase
Excludes vendored C libs (zlib, Miles, DirectXMath, boost, Iggy).
|
2026-03-30 16:25:52 +11:00 |
|
|
Tropical
|
e45151ae64
|
refactor: expand AUTO_VAR macro
|
2026-03-29 23:59:05 -05:00 |
|
|
Sally Knight
|
ca276943f2
|
fix(jui): make creative screen correctly override menu clicked()
(also made rendertooltip names in AbstractContainerScreen match so my editor stops complaining)
|
2026-03-29 15:52:38 -05:00 |
|
|
Sally Knight
|
03fac5b8e1
|
refactor(jui): backport tooltip overloads from JE 1.6.4
|
2026-03-29 15:52:34 -05:00 |
|
|
Sally Knight
|
32149b7ec3
|
refactor(jui): backport hovering over helper from 1.6.x
|
2026-03-29 15:52:18 -05:00 |
|
|
Sally Knight
|
80966a501c
|
refactor(jui): extract tooltip rendering into standalone method
so we can use tooltips elsewhere (the upcoming merchantscreen more specifically)
|
2026-03-29 15:52:18 -05:00 |
|
|
Sally Knight
|
ed83397c55
|
chore(jui): remove inaccurate "unused" comments
|
2026-03-29 15:52:18 -05:00 |
|
|
StevenSYS
|
396e819b9b
|
Made the Java creative inventory more complete.
|
2026-03-27 14:32:47 +00:00 |
|
|
Sally Knight
|
ba406c7e97
|
fix(jui): add null check for items to renderSlot()
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
|
2026-03-24 07:08:37 +03:00 |
|
|
Tropical
|
ad5e8dd012
|
getting further
|
2026-03-22 02:52:30 -05:00 |
|
|
Sally Knight
|
97172039dd
|
Merge branch 'dev' into feat/restore-java-gui
|
2026-03-16 16:04:30 +03:00 |
|
|
Sally Knight
|
fae7ebe7fa
|
feat(jui): new multiline container item tooltips
Backported from Java Edition 1.3.x
This replaces the old non-functional tooltips
|
2026-03-15 18:29:09 +03:00 |
|
|
Tropical
|
e8424f2000
|
chore: format Minecraft.Client
|
2026-03-13 17:10:10 -05:00 |
|
|
Sally Knight
|
5525aac9d5
|
fix: reorder and correct lighting for blocks in container screens
|
2026-03-12 16:07:16 +03:00 |
|
|
Tropical
|
db7a5f9519
|
feat: restore unused java GUI
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
|
2026-03-09 22:29:32 -05:00 |
|
|
Tropical
|
5a36950239
|
fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h
|
2026-03-09 00:34:09 -05:00 |
|
|
Tropical
|
cdc08700e4
|
refactor: unglob std::wstring
|
2026-03-06 11:50:22 -06:00 |
|
|
Tropical
|
67ceccf2d4
|
refactor: unglob std::shared_ptr
|
2026-03-06 11:20:45 -06:00 |
|
|
ella love
|
2383fcee6e
|
feat: move script & folder refactor
|
2026-03-05 03:29:23 -05:00 |
|