sync with upstreaom #2

Open
goatzone wants to merge 581 commits from liza/Questionable:master into master
Showing only changes of commit 569261c041 - Show all commits

View File

@ -157,7 +157,9 @@ internal sealed class CreationUtilsComponent
} }
#endif #endif
#if true #if false
if (_configuration.Advanced.AdditionalStatusInformation)
{
unsafe unsafe
{ {
var actionManager = ActionManager.Instance(); var actionManager = ActionManager.Instance();
@ -166,6 +168,7 @@ internal sealed class CreationUtilsComponent
ImGui.Text($"A2: {actionManager->CastTimeElapsed} / {actionManager->CastTimeTotal}"); ImGui.Text($"A2: {actionManager->CastTimeElapsed} / {actionManager->CastTimeTotal}");
ImGui.Text($"{_questController.TaskQueue.CurrentTaskExecutor?.ProgressContext}"); ImGui.Text($"{_questController.TaskQueue.CurrentTaskExecutor?.ProgressContext}");
} }
}
#endif #endif
if (_targetManager.Target != null) if (_targetManager.Target != null)