Merge tag 'rel-test' into test

Author: Redbot

CMakeLists.txt

@@ -210,7 +210,7 @@ endif()
 # ============================================================================
 # Global settings
 # ============================================================================
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

data/resources/CHANGELOG.md

@@ -1,5 +1,25 @@
 ## 3/22/2026
 
+### Per-Character ImGui Configuration
+
+ImGui configuration can now be saved on a per-character basis. This is now enabled
+by default. The first time a per-character config is loaded, it will be copied from the
+default config if it exists.
+
+Per-character configuration can be toggled from the overlay settings (/mqsettings overlay)
+or via command with /mqoverlay perchar. Changing this option requires a reload of the
+overlay (/mqoverlay reload)
+
+Per-character overlay configuration is saved like: Config/MacroQuest_Overlay/server_character.ini
+
+### Bug fixes
+
+- Fix issue where viewports were not parented to the main viewport. This was preventing them from
+  being brought forward when the game window was focused. (#971)
+
+
+## 3/22/2026 (test)
+
 Update for test patch
 
 
@@ -17,6 +37,12 @@ Update for live patch
 - Fix crash in ItemDisplayWnd
 
 
+## 3/11/2026
+
+emu: Spell links within the item display window will now open a spell
+display window when clicked.
+
+
 ## 3/5/2026
 
 Add support for teek and tormax

src/main/GraphicsEngine.cpp

@@ -41,6 +41,7 @@ bool gbEnableImGuiViewports = false;
 bool gbDeviceAcquired = false;
 
 static bool s_inObjectPreview = false;
+static bool s_renderedImGuiThisFrame = false;
 
 //============================================================================
 //============================================================================
@@ -492,9 +493,13 @@ void MQGraphicsEngine::PostUpdateScene()
 {
 	if (m_deviceAcquired && m_imguiReady && !m_needResetOverlay)
 	{
-		if (gGameState != GAMESTATE_LOGGINGIN && gbRenderImGui)
+		if (gGameState != GAMESTATE_LOGGINGIN
+			&& gbRenderImGui
+			&& !s_renderedImGuiThisFrame)
 		{
 			ImGui_DrawFrame();
+
+			s_renderedImGuiThisFrame = true;
 		}
 	}
 }
@@ -542,6 +547,8 @@ void MQGraphicsEngine::PostEndScene()
 
 void MQGraphicsEngine::OnUpdateFrame()
 {
+	s_renderedImGuiThisFrame = false;
+
 	OnUpdateFrame_Internal();
 
 	// Reset the device hooks between game states. Some of them may alter