From 717d41e7a544d657ae8b27397b5c5dbd9fb50b80 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 11 Aug 2026 23:10:44 +0300 Subject: [PATCH 1/3] fix 3d text render --- src/graphics/render/WorldRenderer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 29b6baf00..051812756 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -492,8 +492,10 @@ void WorldRenderer::renderOpaquePass( ctx.useTexture(advanced_pipeline::TARGET_SKYBOX, skybox->getCubemap()); ctx.useTexture(advanced_pipeline::TARGET_COLOR, nullptr); renderOpaque(ctx, camera, settings, hudVisible); + + ctx.setDepthMask(false); + texts->render(wctx, camera, settings, hudVisible, true); } - texts->render(wctx, camera, settings, hudVisible, true); } void WorldRenderer::renderWeatherEffects(Camera& camera) { From e1a996429fd0cd2d5c0079d9ade7b8a1a03b2749 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 11 Aug 2026 23:40:07 +0300 Subject: [PATCH 2/3] update Entities::hasBlockingInside --- src/objects/Entities.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 0902ae85a..70376e5fe 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -492,10 +492,11 @@ void Entities::render( } bool Entities::hasBlockingInside(AABB aabb) { + constexpr float eps = 0.05f; auto view = registry->view(); for (auto [entity, eid, body] : view.each()) { AABB bodyAABB(body.hitbox.getAABB()); - bodyAABB.scale({1, 0.95f, 1}); + bodyAABB.scale(glm::vec3(1.0f - eps)); if (eid.def.blocking && aabb.intersects(bodyAABB)) { return true; } From a73c181b0173b4d1c61159e03407cb5f3b3eb3bd Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 12 Aug 2026 00:14:57 +0300 Subject: [PATCH 3/3] fix skeleton:get_model --- src/logic/scripting/lua/libs/lib__skeleton.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/scripting/lua/libs/lib__skeleton.cpp b/src/logic/scripting/lua/libs/lib__skeleton.cpp index 2fb5d4fa0..c214ad1d0 100644 --- a/src/logic/scripting/lua/libs/lib__skeleton.cpp +++ b/src/logic/scripting/lua/libs/lib__skeleton.cpp @@ -42,7 +42,7 @@ static int l_get_model(lua::State* L) { auto& rigConfig = *skeleton->config; auto index = index_range_check(*skeleton, lua::tointeger(L, 2)); const auto& modelOverride = skeleton->modelOverrides[index]; - if (!modelOverride.model) { + if (modelOverride.model) { return lua::pushstring(L, modelOverride.name); } return lua::pushstring(L, rigConfig.getBones()[index]->model.name);