sync with upstreaom #2

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

View File

@ -157,14 +157,17 @@ internal sealed class CreationUtilsComponent
} }
#endif #endif
#if true #if false
unsafe if (_configuration.Advanced.AdditionalStatusInformation)
{ {
var actionManager = ActionManager.Instance(); unsafe
ImGui.Text( {
$"A1: {actionManager->CastActionId} ({actionManager->LastUsedActionSequence} → {actionManager->LastHandledActionSequence})"); var actionManager = ActionManager.Instance();
ImGui.Text($"A2: {actionManager->CastTimeElapsed} / {actionManager->CastTimeTotal}"); ImGui.Text(
ImGui.Text($"{_questController.TaskQueue.CurrentTaskExecutor?.ProgressContext}"); $"A1: {actionManager->CastActionId} ({actionManager->LastUsedActionSequence} → {actionManager->LastHandledActionSequence})");
ImGui.Text($"A2: {actionManager->CastTimeElapsed} / {actionManager->CastTimeTotal}");
ImGui.Text($"{_questController.TaskQueue.CurrentTaskExecutor?.ProgressContext}");
}
} }
#endif #endif