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
|
f25b105bee
|
slight optimizations
|
2026-03-29 20:56:00 -05:00 |
|
|
JuiceyDev
|
19e7386d12
|
light fix
|
2026-03-29 20:56:00 -05:00 |
|
|
JuiceyDev
|
3986e4642b
|
ghost segfault???????
|
2026-03-29 20:56:00 -05:00 |
|
|
MatthewBeshay
|
c6fa51d592
|
perf(render): optimise tile entity cleanup and profiling
|
2026-03-29 20:56:00 -05:00 |
|
|
JuiceyDev
|
51ad1434db
|
new culler
|
2026-03-29 20:56:00 -05:00 |
|
|
JuiceyDev
|
abba4b57ce
|
Fixed broken LevelRenderer.cpp and removed merge garbage
|
2026-03-29 20:55:59 -05:00 |
|
|
MatthewBeshay
|
a3f7f7d03c
|
perf(render): improve chunk scheduling and refine rebuild profiling
|
2026-03-29 20:55:59 -05:00 |
|
|
MatthewBeshay
|
47b7d90835
|
feat(profiling): add low-overhead in-engine frame profiler
|
2026-03-29 20:55:59 -05:00 |
|
|
JuiceyDev
|
5e7bba862c
|
perf fix culler thing
|
2026-03-29 20:55:58 -05:00 |
|
|
JuiceyDev
|
5357e75037
|
gamerenderer bit more optimized
|
2026-03-29 20:55:58 -05:00 |
|
|
Tropical
|
73a74f4872
|
chore: clean up LevelRenderer diffs
|
2026-03-29 20:55:58 -05:00 |
|
|
JuiceyDev
|
e2a6c3f92c
|
ss not here
|
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 |
|
|
JuiceyDev
|
dc8c0b04c0
|
apply setchuckoffset to direct shader matrix
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
35d92fe504
|
docs: add FIXME for clipChunk translation
|
2026-03-29 20:55:57 -05:00 |
|
|
MatthewBeshay
|
d53831186e
|
fix(linux): stop core-profile GL state leakage in iggy title rendering
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
485edf0679
|
clean up the diff further
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
fc6e4e32b1
|
undo further LevelRenderer changes
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
fb745767f2
|
undo changes to Camera.cpp
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
69e9db9edc
|
chore: undo some comments
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
c60a71581d
|
revert ItemRenderer changes
|
2026-03-29 20:55:57 -05:00 |
|
|
MatthewBeshay
|
9680753f5e
|
fix(linux): restore UI GL state handoff for core renderer
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
fa24812582
|
revert some seemingly unneeded changes
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
23af1b0a72
|
revert unintentional turnOnGui
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
a4db31ee64
|
add back ItemRenderer comment
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
dbd7ce40cd
|
fix: don't GL_NORMALIZE/GL_RESCALE_NORMAL when rendering items
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
ca601c8205
|
restore original code for renderGuiItem
|
2026-03-29 20:55:57 -05:00 |
|
|
Tropical
|
98c8d49eaf
|
fix: make hit outline width 1 pixel
|
2026-03-29 20:55:56 -05:00 |
|
|
JuiceyDev
|
e0aa739aac
|
batch 2.4 | highlight fix
|
2026-03-29 20:55:56 -05:00 |
|
|
JuiceyDev
|
08ed9861b9
|
batch 2.3 enabling back optimizations
|
2026-03-29 20:55:56 -05:00 |
|
|
JuiceyDev
|
e71ff8699a
|
batch 2.1; entity lightfix
|
2026-03-29 20:55:56 -05:00 |
|
|
JuiceyDev
|
09e8a8f981
|
batch 2: fixing chunk rendering & frustum culling; rewrote most of it, but now it works. next step is to fix the "highlight" effect & add the optimizations i wrote on optifromhell.txt
|
2026-03-29 20:55:56 -05:00 |
|
|
orng
|
7062ef7564
|
chore: fmt
|
2026-03-29 18:40:55 -05:00 |
|
|
orng
|
659b9c32cb
|
fix: OOB when iterating over all cube faces
|
2026-03-28 13:50:35 -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 |
|
|
Tropical
|
eb7bb6e518
|
Merge pull request #330 from 4jcraft/meson-options-cleanup
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: rework meson options, fix ENABLE_VSYNC
|
2026-03-28 11:12:24 -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 |
|
|
Tropical
|
939310be64
|
refactor: rework meson options, fix ENABLE_VSYNC
|
2026-03-28 02:13:27 -05:00 |
|
|
orng
|
ddfe9b3d48
|
refactor: make Tile::getTileAABB return AABB
|
2026-03-28 00:30:07 -05:00 |
|
|
orng
|
78b5255224
|
refactor: make AABBList own its values
|
2026-03-27 22:37:22 -05:00 |
|
|
orng
|
d7d99db4c5
|
refactor: remove AABB::newTemp when not returned
|
2026-03-27 21:56:57 -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 |
|
|
ffqq
|
016a3ebfb4
|
Merge branch '4jcraft:dev' into dev
|
2026-03-28 03:48:04 +03:00 |
|
|
Sally Knight
|
40a3f90d89
|
fix: add null check to renderItemInHand
|
2026-03-28 03:47:49 +03: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 |
|
|
orng
|
20982f11c1
|
chore: format files touched by refactor/remove-vec3-tls
|
2026-03-26 14:13:45 -05:00 |
|