From aee5750759dc7ca7752a2c8742fc6bd2cdaf9128 Mon Sep 17 00:00:00 2001 From: Kelsi Date: Sun, 5 Apr 2026 02:18:00 -0700 Subject: [PATCH 1/3] chore: update FidelityFX-FSR2 submodule (ignore generated shaders) --- extern/FidelityFX-FSR2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/FidelityFX-FSR2 b/extern/FidelityFX-FSR2 index 3d22aefd..22ac2432 160000 --- a/extern/FidelityFX-FSR2 +++ b/extern/FidelityFX-FSR2 @@ -1 +1 @@ -Subproject commit 3d22aefd90fd861e5cee1c3cde18ff185e221f2d +Subproject commit 22ac2432cc58ffd7525caa3c2c5af0b02f942d57 From e0ef682b1e00b43558237c5d14f52136b6471f63 Mon Sep 17 00:00:00 2001 From: Kelsi Date: Sun, 5 Apr 2026 02:35:14 -0700 Subject: [PATCH 2/3] fix(ci): revert FSR2 submodule to remote HEAD, ignore dirty state The .gitignore commit was never pushed to the FSR2 fork, breaking CI shallow clones. Revert to 3d22aef and add ignore=dirty to .gitmodules to suppress generated shader header noise. --- .gitmodules | 1 + extern/FidelityFX-FSR2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b0985eea..a540c023 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,3 +12,4 @@ [submodule "extern/FidelityFX-FSR2"] path = extern/FidelityFX-FSR2 url = https://github.com/Kelsidavis/FidelityFX-FSR2.git + ignore = dirty diff --git a/extern/FidelityFX-FSR2 b/extern/FidelityFX-FSR2 index 22ac2432..3d22aefd 160000 --- a/extern/FidelityFX-FSR2 +++ b/extern/FidelityFX-FSR2 @@ -1 +1 @@ -Subproject commit 22ac2432cc58ffd7525caa3c2c5af0b02f942d57 +Subproject commit 3d22aefd90fd861e5cee1c3cde18ff185e221f2d From 0d188edd7557359c67fd000882e0d167b421ab57 Mon Sep 17 00:00:00 2001 From: Kelsi Date: Sun, 5 Apr 2026 02:35:47 -0700 Subject: [PATCH 3/3] fix(areatrigger): use actual DBC dimensions instead of inflated minimums MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The minimum floor (3.0 for sphere radius, 4.0 for box dimensions) was inflating narrow triggers like AT 5711 (boxWidth 1.06 → 4.0), causing false area trigger fires near the Stormwind AH and unexpected teleports. --- src/game/movement_handler.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/game/movement_handler.cpp b/src/game/movement_handler.cpp index ba74682b..f9a0a2c9 100644 --- a/src/game/movement_handler.cpp +++ b/src/game/movement_handler.cpp @@ -2547,19 +2547,17 @@ void MovementHandler::checkAreaTriggers() { bool inside = false; if (at.radius > 0.0f) { - // Sphere trigger — use actual radius, with small floor for very tiny triggers - float effectiveRadius = std::max(at.radius, 3.0f); + // Sphere trigger — use actual DBC radius float dx = px - at.x; float dy = py - at.y; float dz = pz - at.z; float distSq = dx * dx + dy * dy + dz * dz; - inside = (distSq <= effectiveRadius * effectiveRadius); + inside = (distSq <= at.radius * at.radius); } else if (at.boxLength > 0.0f || at.boxWidth > 0.0f || at.boxHeight > 0.0f) { - // Box trigger — use actual size, with small floor for tiny triggers - float boxMin = 4.0f; - float effLength = std::max(at.boxLength, boxMin); - float effWidth = std::max(at.boxWidth, boxMin); - float effHeight = std::max(at.boxHeight, boxMin); + // Box trigger — use actual DBC dimensions + float effLength = at.boxLength; + float effWidth = at.boxWidth; + float effHeight = at.boxHeight; float dx = px - at.x; float dy = py - at.y;