Tropical
1767c3f6e9
chore: fmt
2026-03-30 09:37:24 -05:00
MatthewBeshay
a513fa7597
Rename CriticalSection wrapper functions to match std::mutex usage
...
EnterCallbackIdCriticalSection/LeaveCallbackIdCriticalSection -> lockCallbackScenes/unlockCallbackScenes, EnterSaveNotificationSection/LeaveSaveNotificationSection -> lockSaveNotification/unlockSaveNotification, m_saveNotificationCriticalSection -> m_saveNotificationMutex.
2026-03-31 00:16:16 +11:00
MatthewBeshay
f1df21590b
Merge dev and resolve formatting conflicts
2026-03-30 19:00:30 +11:00
MatthewBeshay
bc6013ab70
Replace all CRITICAL_SECTION usage with std::mutex and std::lock_guard
...
Migrates 59 files from WinAPI CRITICAL_SECTION to portable C++ std::mutex/std::lock_guard/std::unique_lock. Removes Linux CRITICAL_SECTION shims from winapi_stubs.h.
2026-03-30 18:45:55 +11:00
Tropical
c9b90cae2c
chore: format everything
2026-03-30 02:17:54 -05:00
MatthewBeshay
28d68befd4
Replace remaining WinAPI types with standard C++ equivalents
...
DWORD→uint32_t, BYTE→uint8_t, HRESULT→int32_t, HANDLE→void*, UINT→uint32_t, INT→int32_t, WORD→uint16_t, LONG→int32_t, SHORT→int16_t, LONGLONG→int64_t, ULONG_PTR→uintptr_t, PBYTE→uint8_t*, LPWSTR/PWSTR→wchar_t*, FLOAT→float, CHAR→char, boolean→bool, CONST→const, TRUE→true, FALSE→false across 176 files (excluding vendor libs and Linux stubs).
2026-03-30 17:36:15 +11:00
Tropical
f03c7163f4
WCHAR -> wchar_t
2026-03-30 00:42:26 -05:00
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
6ed953a3c3
refactor: replace double-underscore MSVC integer types with stdint
2026-03-30 00:08:25 -05:00
Tropical
e45151ae64
refactor: expand AUTO_VAR macro
2026-03-29 23:59:05 -05:00
MatthewBeshay
a104252557
Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2
...
# Conflicts:
# Minecraft.Client/Platform/Common/Consoles_App.cpp
# Minecraft.World/IO/Files/File.cpp
2026-03-30 15:28:11 +11:00
Tropical
e4c0a3a35b
fix: assets loading and text input issues
2026-03-29 23:24:37 -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
JuiceyDev
413f22f231
Merge branch 'dev' into func/bttr-cwd
Build (Linux, x86-64) / build-linux (push) Has been cancelled
Format Check / clang-format (push) Has been cancelled
2026-03-30 04:13:11 +02: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
JuiceyDev
6be5f627ef
make consoles_app use pathhelper :)
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Clang Format / clang-format (push) Has been cancelled
2026-03-27 20:57:46 +01:00
JuiceyDev
21fc2166ff
cleaned up, less hacky, more silly
2026-03-27 20:54:21 +01:00
JuiceyDev
256a809750
feat/bttr-cwd
2026-03-27 11:52:05 +01:00
orng
9fe3315112
refactor: remove vec3 tls
2026-03-26 13:37:01 -05:00
orng
bee10e55a8
refactor: remove calls to Vec3::newTemp when not returned
2026-03-26 04:19:04 -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
8e94b763a7
refactor: remove usage of win32 Sleep function for this_thread::sleep_for
2026-03-25 19:12:11 -05:00
Tropical
7e27377d46
fix: incorrect HtmlString formatting for colored text
2026-03-23 13:23:58 -05:00
Sally Knight
7ea3e11373
fix: add HopperTileEntity.h include to Consoles_App
2026-03-22 23:31:10 +03:00
Tropical
195d82340a
merge Consoles_App.h
2026-03-22 01:03:39 -05:00
Tropical
fb2faecf33
format Consoles_app
2026-03-22 00:12:31 -05:00
Tropical
e444bef081
implement DebugArtToolsOn, fix strings and includes
2026-03-21 23:50:56 -05: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
notmatthewbeshay
a560826bad
Fix the remaining C++26 build warnings
2026-03-16 22:17:17 +11:00
notmatthewbeshay
4866a895dc
Rename misleading DWORD-style count parameters
2026-03-16 05:30:42 +11:00
notmatthewbeshay
506964f2b4
Remove WinAPI byte allocation in common app
2026-03-16 04:52:17 +11:00
notmatthewbeshay
3a98ff640c
Remove WinAPI primitives from common app helpers
2026-03-16 04:49:34 +11:00
notmatthewbeshay
a2ddb7c2f0
Remove WinAPI ints from network and save helpers
2026-03-14 06:52:03 +11:00
notmatthewbeshay
8a66847c65
Remove UINT from common resource ID arrays
2026-03-14 06:33:33 +11:00
notmatthewbeshay
00d65b8487
Address remaining review feedback on buffer reads
2026-03-13 20:11:00 +11:00
notmatthewbeshay
bcc765f3e7
Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup
...
# Conflicts:
# Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
# Minecraft.Client/Rendering/Tesselator.cpp
2026-03-13 15:16:43 +11:00
notmatthewbeshay
d2156d417c
Use standard types in profile content helpers
2026-03-11 16:23:57 +11:00
notmatthewbeshay
1490d0b067
Use standard callback cookies in profile manager
2026-03-11 16:21:14 +11:00
notmatthewbeshay
2b638adf93
Use standard types in storage callbacks
2026-03-11 16:12:53 +11:00
notmatthewbeshay
a503336887
Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup
2026-03-11 16:02:48 +11:00
notmatthewbeshay
082dc2033d
Use standard DLC mount callback types
2026-03-11 15:46:23 +11:00
notmatthewbeshay
3c2669b2a7
Use fixed-width pack IDs in DLC packs
2026-03-11 15:38:50 +11:00
notmatthewbeshay
6556b316dc
Use standard counters in DLC manager
2026-03-11 15:38:50 +11:00
notmatthewbeshay
ab89d415a2
Use standard message option arrays in app flows
2026-03-11 15:38:50 +11:00
notmatthewbeshay
fba6dd8275
Use standard temporary counters in common app
2026-03-11 15:38:49 +11:00
