ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #256 from goatcorp/imgui_update

Browse source
This commit is contained in:
goaaats 2021-02-10 02:18:47 +01:00 • committed by GitHub
commit 75742f79b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Dalamud.cs
View file

@ -263,7 +263,7 @@ namespace Dalamud {
Log.Information("Dalamud is ready.");
} catch (Exception ex) {
Log.Error(ex, "Oh no! Dalamud::Start() failed.");
Log.Error(ex, "Dalamud::Start() failed.");
Unload();
}
}
@ -308,9 +308,9 @@ namespace Dalamud {
AntiDebug.Dispose();
Log.Debug("Dalamud::Dispose OK!");
Log.Debug("Dalamud::Dispose() OK!");
} catch (Exception ex) {
Log.Error(ex, "skjdgjjkodsfg");
Log.Error(ex, "Dalamud::Dispose() failed.");
}
}

2
Dalamud/EntryPoint.cs
View file

@ -66,7 +66,7 @@ namespace Dalamud {
#endif
var newLogger = new LoggerConfiguration()
.WriteTo.Async(a => a.File(logPath, outputTemplate: "{Timestamp:HH:mm:ss.fff}[{Level:u3}] {Message:lj}{NewLine}{Exception}"))
.WriteTo.Async(a => a.File(logPath, outputTemplate: "[{Timestamp:HH:mm:ss.fff}][{Level:u3}] {Message:lj}{NewLine}{Exception}"))
.WriteTo.EventSink()
.MinimumLevel.ControlledBy(levelSwitch)
.CreateLogger();

5
Dalamud/Interface/DalamudInterface.cs
View file

@ -22,6 +22,8 @@ namespace Dalamud.Interface
{
private readonly Dalamud dalamud;
private ulong frameCount = 0;
public DalamudInterface(Dalamud dalamud) {
this.dalamud = dalamud;
}
@ -243,6 +245,9 @@ namespace Dalamud.Interface
if (this.dalamud.Framework.Gui.GameUiHidden)
ImGui.BeginMenu("UI is hidden...", false);
ImGui.BeginMenu(this.frameCount.ToString(), false);
this.frameCount++;
ImGui.EndMainMenuBar();
}
}

4
Dalamud/Plugin/PluginManager.cs
View file

@ -182,6 +182,8 @@ namespace Dalamud.Plugin
return false;
}
Log.Verbose("Plugin CreateInstance...");
var plugin = (IDalamudPlugin)Activator.CreateInstance(type);
// this happens for raw plugins that don't specify a PluginDefinition - just generate a dummy one to avoid crashes anywhere
@ -202,6 +204,8 @@ namespace Dalamud.Plugin
return false;
}
Log.Verbose("Plugin Initialize...");
var dalamudInterface = new DalamudPluginInterface(this.dalamud, type.Assembly.GetName().Name, this.pluginConfigs, reason);
plugin.Initialize(dalamudInterface);

2
lib/ImGuiScene

@ -1 +1 @@
Subproject commit cc64961aab96356c3f67ba7ff529448e2d04e4b3
Subproject commit ab463eb0434c1ffa864adfc3699afc2fe707489d