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
51e61a12b4
refactor: replace some win32 typedefs
2026-03-30 00:16:26 -05:00
Tropical
e45151ae64
refactor: expand AUTO_VAR macro
2026-03-29 23:59:05 -05:00
MatthewBeshay
6000900285
Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2
...
# Conflicts:
# Minecraft.Client/Level/ServerLevel.cpp
# Minecraft.Client/Minecraft.cpp
# Minecraft.Client/MinecraftServer.cpp
# Minecraft.Client/Network/ClientConnection.cpp
# Minecraft.Client/Network/ServerChunkCache.cpp
# Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
# Minecraft.Client/Platform/Common/Consoles_App.cpp
# Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
# Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp
# Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
# Minecraft.Client/Platform/Common/UI/UIController.cpp
# Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
# Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
# Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
# Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
# Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
# Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp
# Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
# Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
# Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp
# Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
# Minecraft.Client/Platform/Durango/Durango_Minecraft.cpp
# Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
# Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
# Minecraft.Client/Platform/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
# Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
# Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
# Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
# Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
# Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
# Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp
# Minecraft.Client/Platform/stdafx.h
# Minecraft.Client/Player/LocalPlayer.cpp
# Minecraft.Client/Rendering/Chunk.cpp
# Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp
# Minecraft.Client/Rendering/GameRenderer.cpp
# Minecraft.Client/Rendering/LevelRenderer.cpp
# Minecraft.Client/Textures/BufferedImage.cpp
# Minecraft.Client/UI/Screens/AchievementScreen.cpp
# Minecraft.Client/UI/Screens/ContainerScreen.cpp
# Minecraft.Client/UI/Screens/TrapScreen.cpp
# Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
# Minecraft.World/IO/Files/File.cpp
# Minecraft.World/Player/Player.cpp
# Minecraft.World/Util/C4JThread.cpp
2026-03-30 15:21:08 +11:00
StevenSYS
d18733b14c
Ported over the Java Edition's title screen panorama.
2026-03-29 15:50:35 -05:00
Sally Knight
0728ac8731
fix(jui): tick screen even if not ingame
...
required for title screen panorama
2026-03-29 15:50:34 -05:00
orng
a0be2e2fb5
refactor: remove aabb tls
2026-03-28 03:05:06 -05:00
Tropical
06c73c821c
Merge pull request #312 from 4jcraft/refactor/replace-sleep
...
refactor: replace win32 thread sleeping and yielding with `std::thread` primitives
2026-03-27 18:47:47 -05:00
orng
9fe3315112
refactor: remove vec3 tls
2026-03-26 13:37:01 -05:00
MatthewBeshay
f19563bbd7
cleanup: flatten dead branches in common app and ui code
2026-03-26 20:18:29 +11:00
MatthewBeshay
6ef7d05f7e
cleanup: collapse common app and ui console branches
2026-03-26 18:49:24 +11:00
MatthewBeshay
ad5da38321
cleanup: remove console platform code from shared includes and build paths
2026-03-26 17:53:37 +11:00
orng
7b021bc99d
wip: removing vec3 tls
2026-03-26 01:10:27 -05:00
MatthewBeshay
2117a772d7
checkpoint: refresh supported-path portability baseline
2026-03-26 17:05:31 +11:00
Tropical
cbca0280b4
rust brainrot
2026-03-25 19:21:36 -05:00
Tropical
d9f03fdddf
refactor: replace 0ms sleep with a proper yield
2026-03-25 19:13:12 -05:00
Tropical
8e94b763a7
refactor: remove usage of win32 Sleep function for this_thread::sleep_for
2026-03-25 19:12:11 -05:00
orng
1538074b4d
refactor: remove integer caching
2026-03-25 02:47:51 -05:00
Sally Knight
d6070001d0
fix(jui): re-enable screen reinitialization on resize
2026-03-24 22:38:54 +03:00
Sally Knight
f6e151265c
fix(jui): mouse unlocking while in a screen
2026-03-24 07:00:21 +03:00
Sally Knight
3310481ca3
fix(jui): use the same iggy scalings for java UI
2026-03-24 06:59:49 +03:00
Sally Knight
032e56a47a
fix(jui): add missing screen assignment to setScreen()
2026-03-24 06:53:14 +03:00
MatthewBeshay
fed9cf2d95
fix: resolve all build warnings and notes
2026-03-23 18:53:18 +11:00
Tropical
1c5311f058
fixes to java UI and Minecraft.cpp
2026-03-22 04:14:58 -05:00
Tropical
371c734719
merge toplevel Minecraft.Client folders
2026-03-21 23:21:19 -05:00
Sally Knight
24512f44ad
feat(jui): remap creative inventory to C
...
This will allow players to open their survival inventory in Creative mode on the java UI
2026-03-21 03:02:11 +03:00
Sally Knight
0fbbac1cde
feat(jui): add world leaving
...
You will now be able to leave the world from all places where you'd usually be able to (Pause screen, death screen)
Should be identical to the way it's done on Iggy/XUI
2026-03-19 15:05:32 +03:00
Sally Knight
221c6ccad1
fix: re-enable death screen on java gui
...
was removed accidentally
2026-03-18 22:24:12 +03:00
ffqq
f46e8b3941
Merge pull request #155 from 4jcraft/feat/restore-java-gui
...
feat: restore unused java GUI
2026-03-16 18:36:17 +03:00
Sally Knight
97172039dd
Merge branch 'dev' into feat/restore-java-gui
2026-03-16 16:04:30 +03:00
notmatthewbeshay
a560826bad
Fix the remaining C++26 build warnings
2026-03-16 22:17:17 +11:00
Tropical
9748827f72
Merge pull request #257 from TheComputerGuy96/fix/iggy-check
...
Publish Documentation / build (push) Waiting to run
Publish Documentation / deploy (push) Blocked by required conditions
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
Minecraft::run_middle: Don't use non-Iggy codepath on Iggy
2026-03-15 23:50:14 -05:00
Echo J.
32affed49d
Minecraft::run_middle: Don't use non-Iggy codepath on Iggy
2026-03-16 04:18:16 +00:00
lotaviods
6ad898877d
fix: add dynamic window resize support
2026-03-16 01:11:29 -03:00
Tropical
ec87b5c424
chore: add back emergencySave
2026-03-15 16:35:57 -05:00
Tropical
61a3afcca3
fix: re-enable automatic LoadTrial when iggy is disabled, fmt
2026-03-15 16:32:33 -05:00
notmatthewbeshay
6a49f3a83e
Fix broken renderDebug block in run_middle
2026-03-15 00:55:48 +11:00
Tropical
f66b293e33
Merge branch 'dev' into feat/iggy-dev
2026-03-14 03:25:09 -05:00
Tropical
2d0450e578
fix: remove all linux-specific hacks for iggy
...
breaks title sequence, some menu rendering. need to do root-cause analysis to find out why
2026-03-14 02:47:00 -05:00
Tropical
e8424f2000
chore: format Minecraft.Client
2026-03-13 17:10:10 -05:00
Tropical
f4d8815285
Merge pull request #209 from Acemany/fix-file-delimeter
...
fix File class' delimeter and homepath detection
2026-03-13 13:36:17 -05:00
notmatthewbeshay
0249bfd2bf
Fix Linux build warnings
2026-03-14 04:37:55 +11:00
Tropical
177ed6d176
Merge pull request #215 from 4jcraft/dev
...
just merging all of the dev branch stuff into the java gui branch
2026-03-13 12:11:37 -05:00
lotaviods
66fb0f1a96
feat: Implement creative inventory
2026-03-13 03:22:42 -03:00
Acemany
3cbd496186
Fix File class' delimeter and homepath detection
...
meow :3
deleted Minecraft::OS enum because we have #ifdef
mrrrp
changed save directory name to not mess with minecraft java
2026-03-13 06:10:44 +03:00
notmatthewbeshay
a503336887
Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup
2026-03-11 16:02:48 +11:00
notmatthewbeshay
4460bca43f
Use standard types in minecraft state
2026-03-11 15:38:51 +11:00
Tropical
cf3defee35
Merge branch 'dev' into feat/restore-java-gui
2026-03-10 21:02:58 -05:00
Tropical
ca9ac8e7f7
fix: hotbarSlot is zero-indexed, move max hotbar slots into a constant
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-10 20:18:03 -05:00
