Tropical
|
c9b90cae2c
|
chore: format everything
|
2026-03-30 02:17:54 -05: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 |
|
|
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 |
|
|
Sally Knight
|
1ab985805a
|
feat(jui): add beacon screen
|
2026-03-29 15:52:35 -05:00 |
|
|
Sally Knight
|
97c6704d82
|
feat(jui): add merchant screen
|
2026-03-29 15:52:19 -05:00 |
|
|
Sally Knight
|
3dcc985cd4
|
feat(jui): add brewing stand screen (+ fix enchantment screen not being used)
|
2026-03-29 15:52:18 -05:00 |
|
|
Sally Knight
|
bdebc23e91
|
fix(jui): open hopper screen for minecart hopper as well
|
2026-03-29 15:50:36 -05:00 |
|
|
Sally Knight
|
5ac7f23577
|
feat(jui): add hopper screen
|
2026-03-29 15:50:36 -05:00 |
|
|
Sally Knight
|
975f716f9c
|
feat(jui): re-enable and update TrapScreen
(Dispenser and Dropper GUI)
|
2026-03-29 15:50:36 -05:00 |
|
|
Sally Knight
|
fbbf086f71
|
feat(jui): add anvil screen
|
2026-03-29 15:50:35 -05:00 |
|
|
Sally Knight
|
11f71c12b2
|
chore: fmt
|
2026-03-29 15:50:34 -05:00 |
|
|
Sally Knight
|
65ff6a97f0
|
feat(jui): add horse inventory screen
|
2026-03-29 15:50:34 -05:00 |
|
|
orng
|
7101d03c6a
|
refactor: remove heap-allocated AABBs
|
2026-03-28 02:58:56 -05:00 |
|
|
orng
|
20982f11c1
|
chore: format files touched by refactor/remove-vec3-tls
|
2026-03-26 14:13:45 -05:00 |
|
|
orng
|
e887c8cf45
|
refactor: remove calls to Vec3::newTemp and Vec3::newPermanent
|
2026-03-26 13:29:05 -05:00 |
|
|
MatthewBeshay
|
12ff12a263
|
cleanup: flatten dead branches in client render texture and runtime code
|
2026-03-26 20:29:59 +11:00 |
|
|
MatthewBeshay
|
1fecbf297a
|
cleanup: remove console branches from render texture and world helpers
|
2026-03-26 19:24:04 +11:00 |
|
|
orng
|
7b021bc99d
|
wip: removing vec3 tls
|
2026-03-26 01:10:27 -05:00 |
|
|
Sally Knight
|
98b9cf6147
|
fix(jui): cast the tileEntity in openTextEdit() as a sign
|
2026-03-24 07:01:17 +03:00 |
|
|
Tropical
|
a493e42532
|
TU19: merge Minecraft.Client/Player
|
2026-03-21 22:03:18 -05:00 |
|
|
Sally Knight
|
ecc6f0d549
|
fix(achievements): restore achievement popup display
Was removed by the dev merge
|
2026-03-16 17:25:06 +03:00 |
|
|
Sally Knight
|
97172039dd
|
Merge branch 'dev' into feat/restore-java-gui
|
2026-03-16 16:04:30 +03:00 |
|
|
Tropical
|
e8424f2000
|
chore: format Minecraft.Client
|
2026-03-13 17:10:10 -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 |
|
|
Tropical
|
0577d994f3
|
Merge branch 'dev' into feat/restore-java-gui
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
|
2026-03-11 15:21:48 -05:00 |
|
|
MatthewBeshay
|
42508c8399
|
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup
|
2026-03-11 18:27:03 +11:00 |
|
|
Tropical
|
19bc286818
|
chore: remove another test print
|
2026-03-10 23:33:12 -05:00 |
|
|
Tropical
|
559cdfd281
|
chore: remove test prints
|
2026-03-10 23:31:13 -05:00 |
|
|
Tropical
|
c774e1eb18
|
feat(input): add sprint keys
|
2026-03-10 22:42:14 -05: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 |
|
|
notmatthewbeshay
|
3f374cecad
|
Remove DWORD skin IDs from player customisation APIs
|
2026-03-10 10:14:00 +11: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
|
ed551d8658
|
refactor: unglob std::dynamic_pointer_cast
|
2026-03-06 22:13:29 -06:00 |
|
|
Tropical
|
e0479e90b4
|
fix: unglob everything else and make it build
|
2026-03-06 21:06:31 -06:00 |
|
|
Tropical
|
7c95bfc0bd
|
refactor: begin unglobbing std::vector
|
2026-03-06 11:58:11 -06: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 |
|