diff --git a/ActionTimelineEx/ActionTimelineEx.json b/ActionTimelineEx/ActionTimelineEx.json index f83f26f..854b978 100644 --- a/ActionTimelineEx/ActionTimelineEx.json +++ b/ActionTimelineEx/ActionTimelineEx.json @@ -2,7 +2,6 @@ "Author": "Tischel, ArchiTed", "Name": "ActionTimelineEx", "InternalName": "ActionTimelineEx", - "AssemblyVersion": "1.3.6.0", "Description": "Configurable timeline display of all the actions you use.", "ApplicableVersion": "any", "RepoUrl": "https://github.com/ArchiDog1998/ActionTimelineEx", @@ -12,7 +11,7 @@ "CategoryTags": [ "UI" ], - "DalamudApiLevel": 9, + "DalamudApiLevel": 10, "LoadRequiredState": 0, "LoadSync": false, "CanUnloadAsync": false, diff --git a/ActionTimelineEx/Localization/Localization.json b/ActionTimelineEx/Localization/Localization.json index f0ea35b..3793f48 100644 --- a/ActionTimelineEx/Localization/Localization.json +++ b/ActionTimelineEx/Localization/Localization.json @@ -97,5 +97,16 @@ "XIVConfigUI.Attributes.ConfigUnitType.Degree": "Angle Unit, in degrees.", "XIVConfigUI.Attributes.ConfigUnitType.Yalms": "Distance Unit, in yalms.", "XIVConfigUI.Attributes.ConfigUnitType.Percent": "Ratio Unit, as percentage.", - "XIVConfigUI.Attributes.ConfigUnitType.Pixels": "Display Unit, in pixels." + "XIVConfigUI.Attributes.ConfigUnitType.Pixels": "Display Unit, in pixels.", + "XIVConfigUI.LocalString.Remove": "Remove", + "XIVConfigUI.LocalString.MoveUp": "Move Up", + "XIVConfigUI.LocalString.MoveDown": "Move Down", + "XIVConfigUI.LocalString.CopyToClipboard": "Copy to Clipboard", + "XIVConfigUI.LocalString.FromClipboard": "From Clipboard", + "XIVConfigUI.LocalString.List": "List", + "XIVConfigUI.LocalString.Nothing": "No items in Combo", + "ActionTimeline.Windows.SettingsWindow+AddOne": "AddOne", + "ActionTimeline.Windows.SettingsWindow+ChangeLog": "ChangeLog", + "ActionTimelineEx.Punchline": "Show your actions in real-time.", + "ActionTimelineEx.Description": "Configurable timeline display of all the actions you use." } \ No newline at end of file diff --git a/ActionTimelineEx/Timeline/StatusLineItem.cs b/ActionTimelineEx/Timeline/StatusLineItem.cs index 25b1c87..e1b0c40 100644 --- a/ActionTimelineEx/Timeline/StatusLineItem.cs +++ b/ActionTimelineEx/Timeline/StatusLineItem.cs @@ -1,6 +1,5 @@ using ActionTimeline.Helpers; using ActionTimelineEx.Configurations; -using Dalamud.Interface.Internal; using Dalamud.Interface.Textures.TextureWraps; using ImGuiNET; using System.Numerics; diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs index 9290111..95495a6 100644 --- a/ActionTimelineEx/Timeline/TimelineManager.cs +++ b/ActionTimelineEx/Timeline/TimelineManager.cs @@ -53,7 +53,6 @@ public void Dispose() } #endregion - private delegate void OnActorControlDelegate(uint entityId, ActorControlCategory type, uint buffID, uint direct, uint actionId, uint sourceId, uint arg4, uint arg5, ulong targetId, byte a10); [Signature("E8 ?? ?? ?? ?? 0F B7 0B 83 E9 64", DetourName = nameof(OnActorControl))] private readonly Hook? _onActorControlHook = null; @@ -437,6 +436,7 @@ private async void OnActorControl(uint entityId, ActorControlCategory type, uint private unsafe void OnCast(uint sourceId, IntPtr ptr) { + Svc.Log.Error("Start cast"); _onCastHook?.Original(sourceId, ptr); try diff --git a/ActionTimelineEx/Windows/SettingsWindow.cs b/ActionTimelineEx/Windows/SettingsWindow.cs index 8f8bcff..3f8db50 100644 --- a/ActionTimelineEx/Windows/SettingsWindow.cs +++ b/ActionTimelineEx/Windows/SettingsWindow.cs @@ -4,10 +4,8 @@ using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.GameFonts; -using Dalamud.Interface.Internal; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; -using ECommons.Commands; using ECommons.DalamudServices; using ImGuiNET; using Lumina.Excel.GeneratedSheets; diff --git a/ECommons b/ECommons index 733ecbc..11fd2f0 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit 733ecbcd9c6d13e08a4d0bda7f5f2f7d6327eca2 +Subproject commit 11fd2f06e1374e846e1aada06071da5fc7ef697a diff --git a/XIVConfigUI b/XIVConfigUI index 0dc6c23..81eff75 160000 --- a/XIVConfigUI +++ b/XIVConfigUI @@ -1 +1 @@ -Subproject commit 0dc6c233be10d21b77d9104d94cf7f4f062d9832 +Subproject commit 81eff75dc6256d497646d903cda02b912b5be58d