backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-27 13:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1574 commits 11 branches 1 tag 1.7 GiB
Commit graph

1574 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tropical be2c65486d VOID -> void 2026-03-30 00:38:52 -05:00
Tropical a518b51754 LONG64 -> int64_t 2026-03-30 00:38:52 -05:00
Tropical c8f59b4a99
Merge pull request #356 from MatthewBeshay/cleanup/nullptr-replacement 
refactor: replace NULL with nullptr across C++ codebase
 2026-03-30 00:35:20 -05:00
MatthewBeshay a0fdc643d1 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 
# Conflicts:
#	Minecraft.Client/Network/PlayerChunkMap.cpp
#	Minecraft.Client/Network/PlayerList.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
#	Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
#	Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
#	Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.h
#	Minecraft.Client/Platform/Extrax64Stubs.cpp
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
#	Minecraft.Client/Player/EntityTracker.cpp
#	Minecraft.Client/Player/ServerPlayer.cpp
#	Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
#	Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
#	Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
#	Minecraft.Client/Textures/Stitching/TextureMap.cpp
#	Minecraft.Client/Textures/Textures.cpp
#	Minecraft.World/Blocks/NotGateTile.cpp
#	Minecraft.World/Blocks/PressurePlateTile.cpp
#	Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
#	Minecraft.World/Enchantments/EnchantmentHelper.cpp
#	Minecraft.World/Entities/HangingEntity.cpp
#	Minecraft.World/Entities/LeashFenceKnotEntity.cpp
#	Minecraft.World/Entities/LivingEntity.cpp
#	Minecraft.World/Entities/Mobs/Boat.cpp
#	Minecraft.World/Entities/Mobs/Minecart.cpp
#	Minecraft.World/Entities/Mobs/Witch.cpp
#	Minecraft.World/Entities/SyncedEntityData.cpp
#	Minecraft.World/Items/LeashItem.cpp
#	Minecraft.World/Items/PotionItem.cpp
#	Minecraft.World/Level/BaseMobSpawner.cpp
#	Minecraft.World/Level/CustomLevelSource.cpp
#	Minecraft.World/Level/Level.cpp
#	Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
#	Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
#	Minecraft.World/Level/Storage/RegionFileCache.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
#	Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
#	Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
 2026-03-30 16:28:40 +11: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 00cd713cc8
Merge pull request #355 from 4jcraft/refactor/expand-auto-var 
refactor: replace some win32 typedefs
 2026-03-30 16:21:16 +11:00
Tropical 2ebead56ca remove bool identity type 2026-03-30 00:17:42 -05:00
Tropical 51e61a12b4 refactor: replace some win32 typedefs 2026-03-30 00:16:26 -05:00
MatthewBeshay e65a78d6a7
Merge pull request #354 from 4jcraft/refactor/expand-auto-var 
refactor: replace double-underscore MSVC integer types with stdint
 2026-03-30 16:12:18 +11:00
Tropical 6ed953a3c3 refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -05:00
Tropical 1602fbec39
Merge pull request #353 from 4jcraft/refactor/expand-auto-var 
refactor: expand AUTO_VAR macro
 2026-03-30 00:04:49 -05:00
Tropical e45151ae64 refactor: expand AUTO_VAR macro 2026-03-29 23:59:05 -05:00
Tropical a330ecdcbb
Merge pull request #317 from MatthewBeshay/cleanup/shared-portability-reset-v2 
Cleanup/shared portability reset v2
 2026-03-29 23:38:24 -05:00
Tropical e437a5f4be fix build 2026-03-29 23:35:51 -05:00
MatthewBeshay a104252557 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 
# Conflicts:
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.World/IO/Files/File.cpp
 2026-03-30 15:28:11 +11:00
MatthewBeshay 9375009dd3
Merge pull request #351 from 4jcraft/fix/pathhelper-include 
fix: PathHelper include path
 2026-03-30 15:25:10 +11:00
Tropical e4c0a3a35b fix: assets loading and text input issues 2026-03-29 23:24:37 -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
Tropical 0644d9bcde fix: use correct 4jlibs branch 2026-03-29 23:18:26 -05:00
Tropical c5d50c4066 fix: PathHelper include path 2026-03-29 23:13:15 -05:00
Tropical 2c72e3de6d
Merge pull request #350 from 4jcraft/fix/revert-ci 
revert CI
 2026-03-29 23:02:43 -05:00
Tropical b5b9b66307 add libglm dependency again 2026-03-29 23:00:46 -05:00
Tropical e7af3b42bb
Merge pull request #344 from MatthewBeshay/feat/text-input-support 
Feat/text input support
 2026-03-29 23:00:18 -05:00
Tropical 4ee9175501 don't use apt-install github action 2026-03-29 22:59:23 -05:00
MatthewBeshay 8f61c9b01a fix: update 4jlibs flake input to latest main 
Resolves build failure caused by 4jlibs:gles being an unknown option.
 2026-03-30 14:57:56 +11:00
Tropical 2ce1b0b261 add libglm-dev 2026-03-29 22:56:53 -05:00
Tropical cf1d3436f1 remove env field 2026-03-29 22:56:05 -05:00
Tropical 1128e602fd overcomplicating it 2026-03-29 22:51:54 -05:00
Tropical a5b66ec462 revert CI 2026-03-29 22:46:00 -05:00
MatthewBeshay 7545b7dd87 fix: remove extra blank lines to pass clang-format check 2026-03-30 14:41:27 +11:00
MatthewBeshay 95e0a14b36 refactor: use convStringToWstring for text input instead of uint16 helpers 
GetText now returns UTF-8 directly so callers go through simdutf via
convStringToWstring(). Remove dead uint16_to_wstring helpers.
 2026-03-30 14:10:14 +11:00
MatthewBeshay e89198f56c fix: sign entry crash and remove blocking callback workaround 
- Initialize m_iEditingLine to 0 in SignEntryMenu constructor
  (was uninitialized, causing out-of-bounds array access)
- Add bounds check on m_iEditingLine before array access in callback
- Only truncate sign text if longer than 15 chars (avoid padding)
- Remove manual KeyboardCompleteSeedCallback call in
  LaunchMoreOptionsMenu (no longer needed since RequestKeyboard
  now fires callbacks asynchronously from Tick)
 2026-03-30 13:41:54 +11:00
MatthewBeshay fe4c9bd36c
Merge branch '4jcraft:dev' into feat/text-input-support 2026-03-30 13:22:48 +11:00
Tropical ee5ec1b872
Merge pull request #320 from 4jcraft/func/bttr-cwd 
CWD Deprecation, Better Media searching (sound, fonts, textures).
 2026-03-29 21:17:44 -05:00
JuiceyDev 413f22f231
Merge branch 'dev' into func/bttr-cwd
Some checks failed
Build (Linux, x86-64) / build-linux (push) Has been cancelled
Details
Format Check / clang-format (push) Has been cancelled
Details
2026-03-30 04:13:11 +02:00
MatthewBeshay 31f6e7012c
Merge branch '4jcraft:dev' into feat/text-input-support 2026-03-30 13:12:06 +11:00
ffqq 9eb1fb3509
Merge pull request #324 from 4jcraft/immediategone-v2 
feat: OpenGL 3.3 Core/ES Renderer
 2026-03-30 05:10:49 +03:00
Tropical bfbbf64592 THAT IS SO ANNOYING WHY NIX
Some checks failed
Build (Linux, x86-64) / build-linux (push) Has been cancelled
Details
Format Check / clang-format (push) Has been cancelled
Details
2026-03-29 21:06:57 -05:00
Tropical 4b8ebbb824 what if i 2026-03-29 21:02:24 -05: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
MatthewBeshay b5b4fc34fe fix(linux): increase iggy render-target budget to 64mb 2026-03-29 20:55:59 -05:00
MatthewBeshay f499eaee9c chore(linux): add diagnostics for iggy render-target exhaustion 2026-03-29 20:55:59 -05:00
Tropical 94a67d41b6 inline that 2026-03-29 20:55:59 -05:00