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
|
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 |
|
|
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
|
c5d50c4066
|
fix: PathHelper include path
|
2026-03-29 23:13:15 -05:00 |
|
|
Tropical
|
8c6c17677d
|
Merge pull request #334 from Merc6/refactor/remove-PolygonArray
Publish Documentation / build (push) Waiting to run
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
refactor: optimize `Block` rendering
|
2026-03-29 18:45:06 -05:00 |
|
|
orng
|
b630ec8800
|
fix: Vec3 construct wasn't constexpr
|
2026-03-29 18:34:00 -05:00 |
|
|
Tropical
|
0e56f2c660
|
fix: regression in tile bounding box clip
|
2026-03-29 14:55:36 -05:00 |
|
|
orng
|
f614e661d2
|
refactor: remove PolygonArray
|
2026-03-28 13:34:20 -05:00 |
|
|
orng
|
5ba20b155c
|
refactor: remove VertexArray
|
2026-03-28 12:53:07 -05:00 |
|
|
orng
|
a0be2e2fb5
|
refactor: remove aabb tls
|
2026-03-28 03:05:06 -05:00 |
|
|
orng
|
7101d03c6a
|
refactor: remove heap-allocated AABBs
|
2026-03-28 02:58:56 -05:00 |
|
|
orng
|
78b5255224
|
refactor: make AABBList own its values
|
2026-03-27 22:37:22 -05:00 |
|
|
orng
|
534879e2e7
|
refactor: replace AABB::newPermanent with new AABB
|
2026-03-27 21:17:55 -05:00 |
|
|
orng
|
79217ca8e3
|
refactor: modernize AABB class
|
2026-03-27 21:11:11 -05:00 |
|
|
Tropical
|
9bed5431eb
|
Merge pull request #310 from 4jcraft/refactor/replace-winapi-stubs
refactor: finish up removing `Tls*` functions from linux code
|
2026-03-27 18:53:22 -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 |
|
|
Tropical
|
8b11eb7a3a
|
Merge branch 'dev' into refactor/replace-winapi-stubs
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 18:35:12 -05:00 |
|
|
orng
|
99a7330e31
|
fit: missing const on Vec3::distanceToSqr
|
2026-03-26 16:03:43 -05:00 |
|
|
orng
|
9fe3315112
|
refactor: remove vec3 tls
|
2026-03-26 13:37:01 -05:00 |
|
|
orng
|
e887c8cf45
|
refactor: remove calls to Vec3::newTemp and Vec3::newPermanent
|
2026-03-26 13:29:05 -05:00 |
|
|
MatthewBeshay
|
8d3c504ee6
|
cleanup: flatten dead branches in world io level network and stats
|
2026-03-26 20:53:52 +11:00 |
|
|
orng
|
bee10e55a8
|
refactor: remove calls to Vec3::newTemp when not returned
|
2026-03-26 04:19:04 -05:00 |
|
|
MatthewBeshay
|
1fecbf297a
|
cleanup: remove console branches from render texture and world helpers
|
2026-03-26 19:24:04 +11:00 |
|
|
orng
|
9405f38f80
|
fix: crashing on world join
|
2026-03-26 02:56:15 -05: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
|
8e94b763a7
|
refactor: remove usage of win32 Sleep function for this_thread::sleep_for
|
2026-03-25 19:12:11 -05:00 |
|
|
Tropical
|
06a4096cf6
|
fix: properly assign new pool to m_tlsPool
Clang Format / clang-format (push) Has been cancelled
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
|
2026-03-25 18:43:10 -05:00 |
|
|
orng
|
f1ae42c659
|
refactor: remove basic type containers
|
2026-03-25 17:51:27 -05:00 |
|
|
Tropical
|
7c6c6d3df7
|
refactor: replace winapi TLS functions in Vec3 and AABB
|
2026-03-25 16:22:02 -05:00 |
|
|
orng
|
1538074b4d
|
refactor: remove integer caching
|
2026-03-25 02:47:51 -05:00 |
|
|
Tropical
|
ae15b32a0c
|
Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2
|
2026-03-23 03:45:51 -05:00 |
|
|
Tropical
|
4d1e34dab0
|
Merge branch 'dev' into tu19-take-2
|
2026-03-23 03:45:22 -05:00 |
|
|
MatthewBeshay
|
cc24fc996a
|
fix: clean up sanitizer startup issues
|
2026-03-23 19:34:58 +11:00 |
|
|
MatthewBeshay
|
fed9cf2d95
|
fix: resolve all build warnings and notes
|
2026-03-23 18:53:18 +11:00 |
|
|
Tropical
|
86811a4b0e
|
fix messed up function declaration for u16string_to_wstring
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-22 23:04:06 -05:00 |
|
|
Tropical
|
f820e73cf8
|
fix: a bunch of iggy string encoding UB and use simdutf
|
2026-03-22 22:56:08 -05:00 |
|
|
Tropical
|
6c92bc0be8
|
more build fixes
|
2026-03-22 01:14:52 -05:00 |
|
|
Tropical
|
eb23fc1a83
|
TU19: merge Minecraft.World/Util
|
2026-03-21 17:37:16 -05:00 |
|
|
Tropical
|
357fca24aa
|
refactor: nuke __int64/__uint64 in Minecraft.World
|
2026-03-21 17:10:36 -05:00 |
|
|
Sally Knight
|
97172039dd
|
Merge branch 'dev' into feat/restore-java-gui
|
2026-03-16 16:04:30 +03:00 |
|
|
Tropical
|
1bad0a3048
|
Merge branch 'dev' into feat/iggy-dev
|
2026-03-15 15:30:59 -05:00 |
|
|
notmatthewbeshay
|
7feae96ceb
|
Use standard thread IDs in C4JThread
|
2026-03-16 04:57:54 +11:00 |
|
|
notmatthewbeshay
|
4f5695d4af
|
Use standard wait result types in C4JThread
|
2026-03-16 04:55:38 +11:00 |
|
|
Tropical
|
7bef36fb2e
|
Merge branch 'dev' into feat/iggy-dev
|
2026-03-15 00:49:59 -05:00 |
|
|
Tropical
|
1928c8b662
|
chore: fmt, remove subprojects
|
2026-03-14 22:46:47 -05:00 |
|
|
Sally Knight
|
3f2e7338cc
|
feat: complete language class implementation
yes clang-format was used
|
2026-03-14 18:00:15 +03:00 |
|