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 'refs/heads/master' into apiX

Browse source 
# Conflicts:
#	Dalamud/Game/Libc/LibcFunction.cs
#	Dalamud/Game/Libc/LibcFunctionAddressResolver.cs
#	Dalamud/Game/Libc/OwnedStdString.cs
#	Dalamud/Game/Libc/StdString.cs
#	Dalamud/Interface/UiBuilder.cs
This commit is contained in:
Kaz Wolfe 2024-04-28 11:54:54 -07:00
commit b32ed39826
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
297 changed files with 768 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs
View file

@ -1,10 +1,10 @@
using System.Diagnostics.CodeAnalysis;
using System.Drawing;
using System.Linq;
using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/AddressesWidget.cs
View file

@ -1,6 +1,7 @@
using System.Collections.Generic;
using Dalamud.Game;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/AetherytesWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.Aetherytes;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/ConditionWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.Conditions;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/DtrBarWidget.cs
View file

@ -1,5 +1,6 @@
using Dalamud.Configuration.Internal;
using Dalamud.Game.Gui.Dtr;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/FateTableWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.Fates;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/FlyTextWidget.cs
View file

@ -1,6 +1,7 @@
using System.Numerics;
using Dalamud.Game.Gui.FlyText;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game.ClientState.GamePad;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/IconBrowserWidget.cs
View file

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Numerics;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/KeyStateWidget.cs
View file

@ -1,5 +1,6 @@
using Dalamud.Game.ClientState.Keys;
using Dalamud.Interface.Colors;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

3
Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs
View file

@ -1,14 +1,13 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text.RegularExpressions;
using Dalamud.Data;
using Dalamud.Game.Network;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Memory;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/ServicesWidget.cs
View file

@ -7,6 +7,7 @@ using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.IoC.Internal;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

3
Dalamud/Interface/Internal/Windows/Data/Widgets/TexWidget.cs
View file

@ -4,8 +4,9 @@ using System.Numerics;
using Dalamud.Interface.Utility;
using Dalamud.Plugin.Services;
using ImGuiNET;
using ImGuiScene;
using Serilog;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/ToastWidget.cs
View file

@ -2,6 +2,7 @@
using Dalamud.Game.Gui.Toast;
using Dalamud.Interface.Utility;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;

1
Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs
View file

@ -1,6 +1,7 @@
using System.Numerics;
using Dalamud.Data;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;