ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 06:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into sestring_payloads_refactor

Browse source
This commit is contained in:
meli 2020-05-01 12:13:05 -07:00
commit 67baa81dbe
27 changed files with 623 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Dalamud.cs
View file

@ -241,11 +241,7 @@ namespace Dalamud {
this.isImguiDrawDataWindow = true;
}
if (ImGui.MenuItem("Open Credits window")) {
var logoGraphic =
this.InterfaceManager.LoadImage(
Path.Combine(this.StartInfo.WorkingDirectory, "UIRes", "logo.png"));
this.creditsWindow = new DalamudCreditsWindow(logoGraphic, this.Framework);
this.isImguiDrawCreditsWindow = true;
OnOpenCreditsCommand(null, null);
}
ImGui.MenuItem("Draw ImGui demo", "", ref this.isImguiDrawDemoWindow);
if (ImGui.MenuItem("Dump ImGui info"))
@ -662,7 +658,7 @@ namespace Dalamud {
var logoGraphic =
this.InterfaceManager.LoadImage(
Path.Combine(this.StartInfo.WorkingDirectory, "UIRes", "logo.png"));
this.creditsWindow = new DalamudCreditsWindow(logoGraphic, this.Framework);
this.creditsWindow = new DalamudCreditsWindow(this, logoGraphic, this.Framework);
this.isImguiDrawCreditsWindow = true;
}