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

416 commits

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
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
Tropical 51e61a12b4 refactor: replace some win32 typedefs 2026-03-30 00:16:26 -05:00
Tropical 6ed953a3c3 refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -05:00
Tropical e45151ae64 refactor: expand AUTO_VAR macro 2026-03-29 23:59:05 -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 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 c5d50c4066 fix: PathHelper include path 2026-03-29 23:13:15 -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 c6fa51d592 perf(render): optimise tile entity cleanup and profiling 2026-03-29 20:56:00 -05:00
Tropical 8c6c17677d
Merge pull request #334 from Merc6/refactor/remove-PolygonArray
Some checks are pending
Publish Documentation / build (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details 
refactor: optimize `Block` rendering
 2026-03-29 18:45:06 -05:00
orng b630ec8800 fix: Vec3 construct wasn't constexpr 2026-03-29 18:34:00 -05:00
Sally Knight 1ab985805a feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
Sally Knight 0ce9597e2e chore: fmt (again) 2026-03-29 15:52:18 -05:00
Sally Knight 1a478c8a5b refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
Tropical 0e56f2c660 fix: regression in tile bounding box clip 2026-03-29 14:55:36 -05:00
Tropical 2302f25e93 chore: fmt 2026-03-28 21:38:26 -05:00
Tropical ad77a955c0 fix: correctly restore entity bounding boxes when computing movement physics 2026-03-28 21:36:17 -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
MatthewBeshay c12f32f637 fix: restore ghast reach checks and fire collision bounds after AABB refactor 2026-03-28 20:43:36 +11: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
orng e48a05bb8f refactor: remove the last AABB::newTemp 2026-03-28 00:50:56 -05:00
orng ddfe9b3d48 refactor: make Tile::getTileAABB return AABB 2026-03-28 00:30:07 -05:00
orng 7158fd398f refactor: make Tile::getAABB return optional<AABB> 2026-03-28 00:11:19 -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
Tropical 9bed5431eb
Merge pull request #310 from 4jcraft/refactor/replace-winapi-stubs 
refactor: finish up removing `Tls*` functions from linux code
 2026-03-27 18:53:22 -05: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
Tropical 8b11eb7a3a
Merge branch 'dev' into refactor/replace-winapi-stubs
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details
2026-03-27 18:35:12 -05:00
Tropical 293590ef77
Merge branch 'dev' into dev 2026-03-27 18:20:24 -05:00
Sally Knight 23ab4de9ac fix(goal): add a duration to panics 2026-03-28 02:18:23 +03:00
JuiceyDev 21fc2166ff cleaned up, less hacky, more silly 2026-03-27 20:54:21 +01:00
JuiceyDev ca84ac0512 okay managed to do it, anyways hacky code land :3 
mainly rewrote a bit of the soundengine, made files now load without being mean and uh yeah it works
 2026-03-27 18:07:38 +01:00
JuiceyDev 256a809750 feat/bttr-cwd 2026-03-27 11:52:05 +01:00
orng 99a7330e31 fit: missing const on Vec3::distanceToSqr 2026-03-26 16:03:43 -05:00
orng 20982f11c1 chore: format files touched by refactor/remove-vec3-tls 2026-03-26 14:13:45 -05: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 8d3c504ee6 cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +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
orng 9405f38f80 fix: crashing on world join 2026-03-26 02:56:15 -05:00