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
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
Tropical
d6394de900
fix: get rid of redundant option check
2026-03-29 20:55:58 -05:00
MatthewBeshay
31acc46308
fix(linux): localise chunk transforms and guard optional iggy paths
2026-03-29 20:55:57 -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
Tropical
f820e73cf8
fix: a bunch of iggy string encoding UB and use simdutf
2026-03-22 22:56:08 -05:00
Tropical
86c3e12e7b
TU19: merge UIController and friends
2026-03-22 03:40:11 -05:00
Tropical
4486fc7ab4
format UIController
2026-03-22 03:15:07 -05: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
f66b293e33
Merge branch 'dev' into feat/iggy-dev
2026-03-14 03:25:09 -05:00
notmatthewbeshay
0249bfd2bf
Fix Linux build warnings
2026-03-14 04:37:55 +11:00
Tropical
3a44eab5c0
fix: UB due to assuming wchar_t is utf16
2026-03-13 12:34:28 -05:00
Tropical
49721095f6
fix: const-correctness, remove manual UTF16 conversion
2026-03-13 12:34:28 -05:00
niansa
2b88d096d6
Fixed more inconsistencies around win64 macro and iggy
2026-03-13 12:34:28 -05:00
niansa/tuxifan
5c5f533cdd
Add Linux version of Iggy [Please Squash into feat branch] ( #182 )
...
* Added Linux version of Iggy
* Expose audio functionality
* Reimplemented IggyAudioOutParamExtendedInformation more carefully
* Link to .o files directly
* Allow required SWF files to be loaded on Linux
* Some other misc ifdef WINDOWS64 fixes
* Another ifdef windows64 fix
2026-03-13 12:34:27 -05: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
notmatthewbeshay
7f29aa5d99
Remove Win32 local types from UI controller
2026-03-11 15:38:46 +11:00
notmatthewbeshay
db4ea77ed9
Use standard timer types in UIController
2026-03-11 15:38:43 +11:00
notmatthewbeshay
7f1c1ce7f8
Use bool for tooltip enable state
2026-03-11 15:38:43 +11:00
notmatthewbeshay
b4a005fb8c
Remove Win32 callback types from launch menus
2026-03-11 15:38:43 +11:00
notmatthewbeshay
4e975540a9
Remove Win32 types from UI message boxes
2026-03-11 15:38:43 +11:00
notmatthewbeshay
ca72052b4c
Remove Win32 types from UI substitution textures
2026-03-11 15:38:42 +11: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
ad1e8369bc
refactor: move Common to Platform/Common
2026-03-09 00:17:42 -05:00
