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 |
|
|
MatthewBeshay
|
47b7d90835
|
feat(profiling): add low-overhead in-engine frame profiler
|
2026-03-29 20:55:59 -05:00 |
|
|
JuiceyDev
|
5357e75037
|
gamerenderer bit more optimized
|
2026-03-29 20:55:58 -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
|
69e9db9edc
|
chore: undo some comments
|
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 |
|
|
JuiceyDev
|
08ed9861b9
|
batch 2.3 enabling back optimizations
|
2026-03-29 20:55:56 -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
|
79217ca8e3
|
refactor: modernize AABB class
|
2026-03-27 21:11:11 -05:00 |
|
|
Sally Knight
|
40a3f90d89
|
fix: add null check to renderItemInHand
|
2026-03-28 03:47:49 +03:00 |
|
|
orng
|
87e8078a65
|
refactor: remove new Vec3
|
2026-03-26 14:01:14 -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
|
12ff12a263
|
cleanup: flatten dead branches in client render texture and runtime code
|
2026-03-26 20:29:59 +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 |
|
|
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 |
|
|
orng
|
1538074b4d
|
refactor: remove integer caching
|
2026-03-25 02:47:51 -05:00 |
|
|
Sally Knight
|
3310481ca3
|
fix(jui): use the same iggy scalings for java UI
|
2026-03-24 06:59:49 +03:00 |
|
|
MatthewBeshay
|
fdb2a1098b
|
fix: restore block lightmap sampling
|
2026-03-24 08:21:19 +11:00 |
|
|
Sally Knight
|
98eea45bb7
|
fix: restore entity lighting, use tesselated clouds for night-time lighting
|
2026-03-23 20:33:55 +03:00 |
|
|
MatthewBeshay
|
fed9cf2d95
|
fix: resolve all build warnings and notes
|
2026-03-23 18:53:18 +11:00 |
|
|
Tropical
|
f820e73cf8
|
fix: a bunch of iggy string encoding UB and use simdutf
|
2026-03-22 22:56:08 -05:00 |
|
|
Sally Knight
|
009279bb1b
|
fix(render): don't explicitly set texture parameter settings
|
2026-03-23 02:42:09 +03:00 |
|
|
Tropical
|
8f90088611
|
TU19: merge Minecraft.Client/Rendering
|
2026-03-21 22:28:58 -05:00 |
|
|
Sally Knight
|
938999b707
|
fix(lighting): use gamma value from java UI options for brightness
|
2026-03-16 19:37:12 +03:00 |
|
|
Sally Knight
|
97172039dd
|
Merge branch 'dev' into feat/restore-java-gui
|
2026-03-16 16:04:30 +03:00 |
|
|
lotaviods
|
6ad898877d
|
fix: add dynamic window resize support
|
2026-03-16 01:11:29 -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
|
44ade1f2b2
|
Merge pull request #149 from MatthewBeshay/issue/51-phase-1-portable-win32-cleanup
Draft: remove Win32 types from portable code
|
2026-03-13 11:58:09 -05:00 |
|
|
Sally Knight
|
7fe14f92bb
|
fix: unconditionally enable GL_ALPHA_TEST in renderLevel
Fixes a similar issue to #200 but for the Nether
|
2026-03-13 19:09:21 +03:00 |
|
|
Tropical
|
8f10806f70
|
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-13 01:02:17 -05: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 |
|
|
Sally Knight
|
e41abdb9da
|
fix: make sure to enable alpha test for short/tiny view distances
|
2026-03-13 00:36:39 +03:00 |
|
|
Sally Knight
|
e66f279a5b
|
Merge branch 'dev' into feat/restore-java-gui
|
2026-03-12 16:01:31 +03:00 |
|
|
MatthewBeshay
|
dbdf4fdd22
|
Merge branch 'dev' into issue/51-phase-1-portable-win32-cleanup
|
2026-03-12 10:21:19 +11:00 |
|
|
Sally Knight
|
3031f64401
|
fix: restore rainfall visibility by removing top edge transparency
|
2026-03-12 00:53:50 +03:00 |
|
|
notmatthewbeshay
|
5f8c9c8a25
|
Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup
|
2026-03-11 17:09:16 +11:00 |
|
|
Tropical
|
0c1ae27810
|
Merge branch 'dev' into feat/restore-java-gui
|
2026-03-11 00:44:30 -05:00 |
|
|
notmatthewbeshay
|
a503336887
|
Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup
|
2026-03-11 16:02:48 +11:00 |
|
|
Tropical
|
2c3a816e4b
|
Merge pull request #175 from realffqq/dev
fix: restore and fix entity, block and hand lighting
|
2026-03-10 23:59:42 -05:00 |
|
|
notmatthewbeshay
|
0ab0fd9209
|
Standardise fixed-width integer usage in touched files
|
2026-03-11 15:38:42 +11:00 |
|
|
Emily
|
4e286dd92c
|
ifdef the option 3
|
2026-03-11 00:29:19 -04:00 |
|
|
Sally Knight
|
c42f71ba22
|
fix: restore and fix entity, block and hand lighting
Block and entity light layers are done differently for now due to some caveats with light map transformation
|
2026-03-11 07:13:48 +03:00 |
|