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 |
|
|
orng
|
a0be2e2fb5
|
refactor: remove aabb tls
|
2026-03-28 03:05:06 -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
|
9fe3315112
|
refactor: remove vec3 tls
|
2026-03-26 13:37:01 -05:00 |
|
|
MatthewBeshay
|
039c2884ef
|
fix: restore Linux/common build after dead-branch purge
|
2026-03-26 20:54:08 +11:00 |
|
|
MatthewBeshay
|
1fecbf297a
|
cleanup: remove console branches from render texture and world helpers
|
2026-03-26 19:24:04 +11:00 |
|
|
Tropical
|
7b18641f70
|
chore: clean up unused code from Linux_Minecraft.cpp
|
2026-03-25 16:24:45 -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 |
|
|
Tropical
|
7a35d1caa2
|
fix: run Minecraft::init from the main thread only
this was an orbis-specific hack seemingly that developed into a datarace after merging TU19 causing clang to segfault on startup
|
2026-03-23 01:58:58 -05:00 |
|
|
Sally Knight
|
4ed8fbd852
|
fix: use linux sentientmanager include instead of orbis
|
2026-03-22 22:37:01 +03:00 |
|
|
Sally Knight
|
009b17ef1b
|
fix(gui): working pauses on iggy
|
2026-03-19 18:49:14 +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
|
61a3afcca3
|
fix: re-enable automatic LoadTrial when iggy is disabled, fmt
|
2026-03-15 16:32:33 -05:00 |
|
|
Tropical
|
669e75701b
|
fix: hack around DLC loading to get ingame
|
2026-03-13 12:34:51 -05:00 |
|
|
notmatthewbeshay
|
1490d0b067
|
Use standard callback cookies in profile manager
|
2026-03-11 16:21:14 +11:00 |
|
|
Tropical
|
12ede0691a
|
fix: remove unused console-only asset archive imports
|
2026-03-10 15:22:37 -05:00 |
|
|
sewn
|
bf5f416ba5
|
fix: support backtrace only on glibc systems
execinfo is glibc only, and prevents compiling on
other systems.
|
2026-03-09 15:12:39 +03: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
|
54dab7708d
|
refactor: rename Build -> Platform in Minecraft.World
|
2026-03-08 21:33:18 -05:00 |
|
|
JuiceyDev
|
c7ede72c91
|
Merge pull request #100 from nikita-edel/dev
fix: wstring_to_utf8, depracated function and generated warnings.
|
2026-03-08 23:57:29 +01:00 |
|
|
Nikita Edel
|
1c4aa32b13
|
typo
|
2026-03-08 23:06:52 +01:00 |
|
|
Nikita Edel
|
85df07e232
|
fixed typos
|
2026-03-08 22:59:29 +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
|
c571014bc9
|
refactor: unglob std::unordered_map
|
2026-03-08 22:43:43 +01:00 |
|
|
Pyogenics
|
5c7485144c
|
Create dedicated assets project to enable localisation header generation
|
2026-03-08 22:42:32 +01:00 |
|
|
zukrmn
|
53b5f7058e
|
fix: remove GCC diagnostic pragmas suppressing std::wstring_convert deprecation
|
2026-03-08 22:40:41 +01:00 |
|
|
zukrmn
|
42b0352ec3
|
fix: resolve all remaining compilation warnings
|
2026-03-08 22:40:41 +01:00 |
|
|
Nikita Edel
|
17a10ca9a3
|
fix wstring_to_utf8
|
2026-03-08 22:39:41 +01:00 |
|
|
Tropical
|
43a28fc490
|
Merge pull request #71 from 4jcraft/refactor/no-std-wildcard
refactor: remove `using namespace std`
|
2026-03-08 10:09:33 -05:00 |
|
|
DecalOverdose
|
a508412246
|
Merge pull request #75 from Pyogenics/assetbuild
Asset build on compile
|
2026-03-07 20:44:12 +04:00 |
|
|
Pyogenics
|
edae8c85c9
|
Create dedicated assets project to enable localisation header generation
|
2026-03-07 14:36:34 +00:00 |
|
|
zukrmn
|
b12f34950c
|
fix: remove GCC diagnostic pragmas suppressing std::wstring_convert deprecation
|
2026-03-07 05:31:04 +00:00 |
|
|
zukrmn
|
ca11afdfca
|
fix: resolve all remaining compilation warnings
|
2026-03-07 04:43:50 +00: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 |
|
|
JuiceyDev
|
417ea73050
|
painful update
|
2026-03-06 18:31:46 +01:00 |
|
|
Tropical
|
ecf7fc7f61
|
refactor: unglob std::unordered_map
|
2026-03-06 11:29:36 -06:00 |
|
|
JuiceyDev
|
c55ed7b261
|
game compiles
|
2026-03-06 06:13:22 +01:00 |
|
|
JuiceyDev
|
fddd777399
|
fixed font
|
2026-03-06 00:34:36 +01:00 |
|
|
JuiceyDev
|
1f37e1d422
|
some updates
|
2026-03-06 00:28:53 +01:00 |
|
|
JuiceyDev
|
2f7962cbb2
|
woah
|
2026-03-06 00:19:13 +01:00 |
|
|
JuiceyDev
|
6b6fa9a6b0
|
find my renderers - slenderman or some shit
|
2026-03-05 22:28:13 +01:00 |
|
|
JuiceyDev
|
ad50bf21d4
|
shit renderer
|
2026-03-05 21:31:54 +01:00 |
|
|
JuiceyDev
|
44b4ba84c2
|
Horrible code alert
|
2026-03-05 19:06:07 +01:00 |
|
|
JuiceyDev
|
e7dfce35d4
|
feat: enhance Linux rendering support and clean up unused UI code
|
2026-03-05 13:31:12 +01:00 |
|
|
JuiceyDev
|
70a5f01070
|
feat: OpenGL rendering implementation (GLFW/OpenGL 2.1 pipeline)
|
2026-03-05 11:18:20 +01:00 |
|
|
ella love
|
2383fcee6e
|
feat: move script & folder refactor
|
2026-03-05 03:29:23 -05:00 |
|