Tropical
|
e437a5f4be
|
fix build
|
2026-03-29 23:35:51 -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 |
|
|
Sally Knight
|
97c6704d82
|
feat(jui): add merchant screen
|
2026-03-29 15:52:19 -05:00 |
|
|
orng
|
7101d03c6a
|
refactor: remove heap-allocated AABBs
|
2026-03-28 02:58:56 -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 |
|
|
MatthewBeshay
|
ad5da38321
|
cleanup: remove console platform code from shared includes and build paths
|
2026-03-26 17:53:37 +11:00 |
|
|
MatthewBeshay
|
2117a772d7
|
checkpoint: refresh supported-path portability baseline
|
2026-03-26 17:05:31 +11:00 |
|
|
orng
|
9ea379eb44
|
chore: fix formatting in files touched by
refactor/remove-BasicTypeContainers
|
2026-03-25 18:01:56 -05:00 |
|
|
orng
|
f1ae42c659
|
refactor: remove basic type containers
|
2026-03-25 17:51:27 -05:00 |
|
|
Tropical
|
3f143811e3
|
TU19: merge Minecraft.Client/Network
|
2026-03-21 21:54:07 -05:00 |
|
|
Sally Knight
|
7c3ba79f83
|
feat(jui): (re-)add transitional screens
Adds a new MessageScreen class to display custom messages and restores areas where ReceivingLevelScreen was used
|
2026-03-19 03:37:39 +03:00 |
|
|
Tropical
|
e8424f2000
|
chore: format Minecraft.Client
|
2026-03-13 17:10:10 -05:00 |
|
|
notmatthewbeshay
|
0249bfd2bf
|
Fix Linux build warnings
|
2026-03-14 04:37:55 +11:00 |
|
|
notmatthewbeshay
|
2b5574af95
|
Use standard types in client connection state
|
2026-03-11 15:38:51 +11:00 |
|
|
notmatthewbeshay
|
68661e1d44
|
Use standard pre-login indices in client connection
|
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
|
c8150b1338
|
Use standard small IDs in player colour tracking
|
2026-03-11 15:38:49 +11:00 |
|
|
notmatthewbeshay
|
268ae0388f
|
Use standard booleans in client connection checks
|
2026-03-11 15:38:48 +11:00 |
|
|
notmatthewbeshay
|
37aa3463be
|
Use standard buffer types for in-memory textures
|
2026-03-11 15:38:42 +11:00 |
|
|
notmatthewbeshay
|
474d8b2896
|
Remove Win32 byte types from texture packets
|
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
|
ad1e8369bc
|
refactor: move Common to Platform/Common
|
2026-03-09 00:17:42 -05:00 |
|
|
Tropical
|
66248339e5
|
refactor: unglob std::dynamic_pointer_cast
|
2026-03-08 22:44:00 +01:00 |
|
|
Tropical
|
5fad08b9fd
|
refactor: begin unglobbing std::vector
|
2026-03-08 22:43:43 +01:00 |
|
|
Tropical
|
cff2fc5f44
|
refactor: unglob std::wstring
|
2026-03-08 22:43:43 +01:00 |
|
|
Tropical
|
8812c3967b
|
refactor: unglob std::shared_ptr
|
2026-03-08 22:43:43 +01:00 |
|
|
JuiceyDev
|
417ea73050
|
painful update
|
2026-03-06 18:31:46 +01:00 |
|
|
JuiceyDev
|
c391d290ec
|
Networking Fixes & Updates
|
2026-03-05 20:03:06 +01:00 |
|
|
ella love
|
2383fcee6e
|
feat: move script & folder refactor
|
2026-03-05 03:29:23 -05:00 |
|