From c359ac5a13bdad67bf46a28faf6d144e272f7897 Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Fri, 30 Apr 2021 19:31:10 +1000 Subject: [PATCH 01/12] standardize directory paths and create nested directories correctly Fixes https://github.com/imchillin/Anamnesis/issues/330 --- Anamnesis/Files/Sources/LocalFileSource.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Anamnesis/Files/Sources/LocalFileSource.cs b/Anamnesis/Files/Sources/LocalFileSource.cs index b5f45320b..600cd8f20 100644 --- a/Anamnesis/Files/Sources/LocalFileSource.cs +++ b/Anamnesis/Files/Sources/LocalFileSource.cs @@ -156,6 +156,9 @@ public class Directory : IFileSource.IDirectory { public Directory(string path, LocalFileSource source) { + while (path.EndsWith('\\')) + path = path.Substring(0, path.Length - 1); + this.Path = path; this.Name = Paths.GetFileName(path); this.Source = source; @@ -169,7 +172,7 @@ public Directory(string path, LocalFileSource source) public IFileSource.IDirectory CreateSubDirectory() { - string basePath = this.Path + "New Directory"; + string basePath = this.Path + "\\New Directory"; string newPath = basePath; int i = 1; From 2a12726168011c67244825beb8bfe2fcb935e4ae Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sat, 1 May 2021 20:10:10 +1000 Subject: [PATCH 02/12] preload all weather information in territory Fixes https://github.com/imchillin/Anamnesis/issues/338 hopefully --- .../ViewModels/TerritoryTypeViewModel.cs | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/Anamnesis/GameData/ViewModels/TerritoryTypeViewModel.cs b/Anamnesis/GameData/ViewModels/TerritoryTypeViewModel.cs index a1a72a867..1828cd77d 100644 --- a/Anamnesis/GameData/ViewModels/TerritoryTypeViewModel.cs +++ b/Anamnesis/GameData/ViewModels/TerritoryTypeViewModel.cs @@ -12,44 +12,38 @@ namespace Anamnesis.GameData.ViewModels public class TerritoryTypeViewModel : ExcelRowViewModel, ITerritoryType { - private List? weathers; + private readonly List weathers = new List(); public TerritoryTypeViewModel(int key, ExcelSheet sheet, GameData lumina) : base(key, sheet, lumina) { + this.GetWeathers(); } public override string Name => this.Value?.Name ?? "Unknown"; public string Place => this.Value?.PlaceName?.Value?.Name ?? "Unknown"; public string Region => this.Value?.PlaceNameRegion?.Value?.Name ?? "Unknown"; public string Zone => this.Value?.PlaceNameZone?.Value?.Name ?? "Unknown"; + public List Weathers => this.weathers; - public List Weathers + private void GetWeathers() { - get + if (this.Value == null) + return; + + this.weathers.Clear(); + + WeatherRate weatherRate = GameDataService.WeatherRates!.GetRow((uint)this.Value.WeatherRate); + + if (weatherRate != null && weatherRate.UnkStruct0 != null) { - if (this.weathers == null) + foreach (WeatherRate.UnkStruct0Struct wr in weatherRate.UnkStruct0) { - this.weathers = new List(); - - if (this.Value != null) - { - WeatherRate weatherRate = GameDataService.WeatherRates!.GetRow((uint)this.Value.WeatherRate); - - if (weatherRate != null && weatherRate.UnkStruct0 != null) - { - foreach (WeatherRate.UnkStruct0Struct wr in weatherRate.UnkStruct0) - { - if (wr.Weather == 0) - continue; - - this.weathers.Add(GameDataService.Weathers!.Get(wr.Weather)); - } - } - } - } + if (wr.Weather == 0) + continue; - return this.weathers; + this.weathers.Add(GameDataService.Weathers!.Get(wr.Weather)); + } } } } From c1aab1927a6aeb30ab6b2141cafb20192c269294 Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sat, 1 May 2021 20:53:16 +1000 Subject: [PATCH 03/12] added a scrollbar to pose matrix view fixes https://github.com/imchillin/Anamnesis/issues/329 --- Anamnesis/MainWindow.xaml | 2 +- Anamnesis/Posing/Views/PoseMatrixView.xaml | 1324 ++++++++++---------- 2 files changed, 664 insertions(+), 662 deletions(-) diff --git a/Anamnesis/MainWindow.xaml b/Anamnesis/MainWindow.xaml index 8f6192f6e..54fe5cad7 100644 --- a/Anamnesis/MainWindow.xaml +++ b/Anamnesis/MainWindow.xaml @@ -57,7 +57,7 @@ diff --git a/Anamnesis/Posing/Views/PoseMatrixView.xaml b/Anamnesis/Posing/Views/PoseMatrixView.xaml index 6dcd1e902..024d26ec1 100644 --- a/Anamnesis/Posing/Views/PoseMatrixView.xaml +++ b/Anamnesis/Posing/Views/PoseMatrixView.xaml @@ -15,665 +15,667 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 32090e5b0433f40ca670e9e7b8ed2a146e67101d Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sat, 1 May 2021 21:22:52 +1000 Subject: [PATCH 04/12] Adjust character page load/save buttons --- Anamnesis/Character/Pages/AppearancePage.xaml | 39 ++++++------ Anamnesis/Languages/en.json | 1 + Anamnesis/Styles/Controls/IconButton.xaml | 4 +- Anamnesis/Styles/Controls/IconButton.xaml.cs | 63 +++++-------------- 4 files changed, 38 insertions(+), 69 deletions(-) diff --git a/Anamnesis/Character/Pages/AppearancePage.xaml b/Anamnesis/Character/Pages/AppearancePage.xaml index 2b580a535..faba04e46 100644 --- a/Anamnesis/Character/Pages/AppearancePage.xaml +++ b/Anamnesis/Character/Pages/AppearancePage.xaml @@ -211,40 +211,37 @@ + + + + + - + Key="Character_Appearance_LoadOther" /> - - - + Icon="Save" + Key="Common_SaveFile" + Click="OnSaveClicked"/> diff --git a/Anamnesis/Languages/en.json b/Anamnesis/Languages/en.json index 2ff413621..de638df9a 100644 --- a/Anamnesis/Languages/en.json +++ b/Anamnesis/Languages/en.json @@ -69,6 +69,7 @@ "Weather_Selector_Unnatural_Tooltip": "Only show weathers that are not normally available in the current territory", "Weather_Selector_All_Tooltip": "Show all weathers", + "Character_Appearance_LoadOther": "Load Other", "Character_Appearance_Header": "Appearance", "Character_Appearance_FileHair": "Hair", "Character_Appearaince_Body": "Body", diff --git a/Anamnesis/Styles/Controls/IconButton.xaml b/Anamnesis/Styles/Controls/IconButton.xaml index 15616a8ef..33a80c209 100644 --- a/Anamnesis/Styles/Controls/IconButton.xaml +++ b/Anamnesis/Styles/Controls/IconButton.xaml @@ -15,8 +15,8 @@ - - + + diff --git a/Anamnesis/Styles/Controls/IconButton.xaml.cs b/Anamnesis/Styles/Controls/IconButton.xaml.cs index ad2f71f44..0d5b34c4f 100644 --- a/Anamnesis/Styles/Controls/IconButton.xaml.cs +++ b/Anamnesis/Styles/Controls/IconButton.xaml.cs @@ -7,17 +7,19 @@ namespace Anamnesis.Styles.Controls using System.ComponentModel; using System.Windows; using System.Windows.Controls; + using System.Windows.Media; using Anamnesis.Styles.DependencyProperties; using FontAwesome.Sharp; + using PropertyChanged; /// /// Interaction logic for IconButton.xaml. /// - public partial class IconButton : UserControl, INotifyPropertyChanged + [AddINotifyPropertyChangedInterface] + public partial class IconButton : UserControl { - public static readonly IBind KeyDp = Binder.Register(nameof(Key), OnKeyChanged); - public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(IconButton), new FrameworkPropertyMetadata(new PropertyChangedCallback(OnChanged))); - public static readonly DependencyProperty IconProperty = DependencyProperty.Register(nameof(Icon), typeof(IconChar), typeof(IconButton), new FrameworkPropertyMetadata(new PropertyChangedCallback(OnChanged))); + public static readonly IBind IconDp = Binder.Register(nameof(Icon)); + public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent(nameof(Click), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(IconButton)); public IconButton() @@ -27,59 +29,28 @@ public IconButton() this.ContentArea.DataContext = this; } - public event PropertyChangedEventHandler? PropertyChanged; - public event RoutedEventHandler Click { - add - { - this.AddHandler(ClickEvent, value); - } - - remove - { - this.RemoveHandler(ClickEvent, value); - } - } - - public string? Key { get; set; } - - public string Text - { - get - { - return (string)this.GetValue(TextProperty); - } - - set - { - this.SetValue(TextProperty, value); - } + add => this.AddHandler(ClickEvent, value); + remove => this.RemoveHandler(ClickEvent, value); } - public IconChar Icon + public string? Key { - get - { - return (IconChar)this.GetValue(IconProperty); - } - set - { - this.SetValue(IconProperty, value); - } + get => this.TextBlock.Key; + set => this.TextBlock.Key = value; } - public static void OnKeyChanged(IconButton sender, string val) + public string? Text { - sender.Key = val; + get => this.TextBlock.Text; + set => this.TextBlock.Text = value; } - private static void OnChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) + public IconChar Icon { - if (sender is IconButton target) - { - target.PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(e.Property.Name)); - } + get => IconDp.Get(this); + set => IconDp.Set(this, value); } private void OnClick(object sender, RoutedEventArgs e) From 72e7541470e804252be95b703aa42ac07fe2a887 Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sat, 1 May 2021 21:28:07 +1000 Subject: [PATCH 05/12] update save button when entering directories Fixes https://github.com/imchillin/Anamnesis/issues/337 --- Anamnesis/Files/FileBrowserView.xaml.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Anamnesis/Files/FileBrowserView.xaml.cs b/Anamnesis/Files/FileBrowserView.xaml.cs index 115b906d6..d2d305024 100644 --- a/Anamnesis/Files/FileBrowserView.xaml.cs +++ b/Anamnesis/Files/FileBrowserView.xaml.cs @@ -144,7 +144,7 @@ public EntryWrapper? Selected { this.selected = value; - if (this.mode == Modes.Save) + if (this.mode == Modes.Save && this.selected?.Entry is IFile) { this.FileName = this.selected?.Name ?? string.Empty; } @@ -279,6 +279,7 @@ private set this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.CanGoUp))); this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.CurrentPath))); Task.Run(this.UpdateEntries); + this.Selected = null; } } From 80f0914430b643714f8c519d607cd0f951fa288a Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sat, 1 May 2021 21:34:42 +1000 Subject: [PATCH 06/12] Skeleton parenting can now be merged on inherrit --- Anamnesis/Posing/Templates/SkeletonFile.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Anamnesis/Posing/Templates/SkeletonFile.cs b/Anamnesis/Posing/Templates/SkeletonFile.cs index d5241457a..f9a9e38c0 100644 --- a/Anamnesis/Posing/Templates/SkeletonFile.cs +++ b/Anamnesis/Posing/Templates/SkeletonFile.cs @@ -76,9 +76,18 @@ public void CopyBaseValues(SkeletonFile from) this.BoneNames.Add(key, name); } - if (this.Parenting == null) + if (from.Parenting != null) { - this.Parenting = from.Parenting; + if (this.Parenting == null) + this.Parenting = new Dictionary(); + + foreach ((string bone, string parent) in from.Parenting) + { + if (this.Parenting.ContainsKey(bone)) + continue; + + this.Parenting.Add(bone, parent); + } } } } From e92108e7db70930f44337cc33e0e8e7c71f4962f Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sat, 1 May 2021 21:34:53 +1000 Subject: [PATCH 07/12] Hrothgar facial parenting Fixes https://github.com/imchillin/Anamnesis/issues/334 --- Anamnesis/Data/Skeletons/Hrothgar.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Anamnesis/Data/Skeletons/Hrothgar.json b/Anamnesis/Data/Skeletons/Hrothgar.json index fada9d1f6..97199a025 100644 --- a/Anamnesis/Data/Skeletons/Hrothgar.json +++ b/Anamnesis/Data/Skeletons/Hrothgar.json @@ -27,5 +27,13 @@ "Head_20": "LipUpperLeft", "Head_21": "LipUpperRight", "Head_22": "LipLowerA" + }, + + "Parenting": { + "LipUpperLeft": "RootHead", + "LipUpperRight": "RootHead", + "JawUpper": "RootHead", + "WhiskersLeft": "RootHead", + "WhiskersRight": "RootHead" } } \ No newline at end of file From d69dc4e117757da09f3d984dc6f4d96c8ec7797c Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sat, 1 May 2021 21:36:57 +1000 Subject: [PATCH 08/12] Tail E reenabled Fixes https://github.com/imchillin/Anamnesis/issues/308 --- Anamnesis/Data/Skeletons/Middy.json | 1 + Anamnesis/Posing/Views/PoseGUIView.xaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Anamnesis/Data/Skeletons/Middy.json b/Anamnesis/Data/Skeletons/Middy.json index 1fcd4b1ff..1db87764d 100644 --- a/Anamnesis/Data/Skeletons/Middy.json +++ b/Anamnesis/Data/Skeletons/Middy.json @@ -271,6 +271,7 @@ "TailB": "TailA", "TailC": "TailB", "TailD": "TailC", + "TailE": "TailD", "Met_0": "RootHead", "Met_1": "RootHead", diff --git a/Anamnesis/Posing/Views/PoseGUIView.xaml b/Anamnesis/Posing/Views/PoseGUIView.xaml index 646893648..e27878071 100644 --- a/Anamnesis/Posing/Views/PoseGUIView.xaml +++ b/Anamnesis/Posing/Views/PoseGUIView.xaml @@ -385,7 +385,7 @@ - + From 98866d9e40a443fcffc6725d768fee8200daa1b3 Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sun, 2 May 2021 16:36:32 +1000 Subject: [PATCH 09/12] Add flipping to localization, rename mirror to flip where applicable --- Anamnesis/Languages/en.json | 1 + Anamnesis/Posing/Pages/PosePage.xaml | 4 ++-- Anamnesis/Posing/Pages/PosePage.xaml.cs | 28 ++++++++++++------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Anamnesis/Languages/en.json b/Anamnesis/Languages/en.json index de638df9a..d7183df60 100644 --- a/Anamnesis/Languages/en.json +++ b/Anamnesis/Languages/en.json @@ -156,6 +156,7 @@ "Pose_SaveBones": "Save {0} Bones", "Pose_Load": "Load", "Pose_LoadBones": "Load {0} Bones", + "Pose_Flip": "Flip", "Pose_FreezePhysics": "Freeze Physics", "Pose_Parenting": "Parenting", diff --git a/Anamnesis/Posing/Pages/PosePage.xaml b/Anamnesis/Posing/Pages/PosePage.xaml index 3271e4cde..c34f47ff7 100644 --- a/Anamnesis/Posing/Pages/PosePage.xaml +++ b/Anamnesis/Posing/Pages/PosePage.xaml @@ -136,9 +136,9 @@ Grid.Column="2" Margin="2" Padding="6,3" - Click="OnMirrorClicked" + Click="OnFlipClicked" Style="{StaticResource TransparentButton}" Grid.ColumnSpan="2"> - + diff --git a/Anamnesis/Posing/Pages/PosePage.xaml.cs b/Anamnesis/Posing/Pages/PosePage.xaml.cs index 28ee4fa95..7f269838a 100644 --- a/Anamnesis/Posing/Pages/PosePage.xaml.cs +++ b/Anamnesis/Posing/Pages/PosePage.xaml.cs @@ -49,7 +49,7 @@ public PosePage() public PoseService PoseService { get => PoseService.Instance; } public TargetService TargetService { get => TargetService.Instance; } - public bool IsMirroring { get; private set; } + public bool IsFlipping { get; private set; } public SkeletonVisual3d? Skeleton { get; private set; } public PoseFile.Configuration FileConfiguration => FileConfig; @@ -64,13 +64,13 @@ public PosePage() * - store the second quat (from right bone) on the left bone * - if not: * - store the quat on the target bone - * - recursively mirror on all child bones + * - recursively flip on all child bones */ - private void MirrorBone(BoneVisual3d? targetBone, bool shouldFlip = true) + private void FlipBone(BoneVisual3d? targetBone, bool shouldFlip = true) { if (targetBone != null) { - CmQuaternion newRotation = QuaternionExtensions.Mirror(targetBone.ViewModel.Rotation); // character-relative transform + CmQuaternion newRotation = targetBone.ViewModel.Rotation.Mirror(); // character-relative transform if (shouldFlip && targetBone.BoneName.EndsWith("Left")) { BoneVisual3d? rightBone = targetBone.Skeleton.GetBone(targetBone.BoneName.Replace("Left", "Right")); @@ -100,7 +100,7 @@ private void MirrorBone(BoneVisual3d? targetBone, bool shouldFlip = true) { if (child is BoneVisual3d childBone) { - this.MirrorBone(childBone, shouldFlip); + this.FlipBone(childBone, shouldFlip); } } } @@ -248,18 +248,18 @@ private void OnSelectChildrenClicked(object sender, RoutedEventArgs e) this.Skeleton.Select(bones, SkeletonVisual3d.SelectMode.Add); } - private void OnMirrorClicked(object sender, System.Windows.RoutedEventArgs e) + private void OnFlipClicked(object sender, System.Windows.RoutedEventArgs e) { - if (this.Skeleton != null && !this.IsMirroring) + if (this.Skeleton != null && !this.IsFlipping) { - // if no bone selected, mirror both lumbar and waist bones - this.IsMirroring = true; + // if no bone selected, flip both lumbar and waist bones + this.IsFlipping = true; if (this.Skeleton.CurrentBone == null) { BoneVisual3d? waistBone = this.Skeleton.GetBone("Waist"); BoneVisual3d? lumbarBone = this.Skeleton.GetBone("SpineA"); - this.MirrorBone(waistBone); - this.MirrorBone(lumbarBone); + this.FlipBone(waistBone); + this.FlipBone(lumbarBone); waistBone?.ReadTransform(true); lumbarBone?.ReadTransform(true); } @@ -269,17 +269,17 @@ private void OnMirrorClicked(object sender, System.Windows.RoutedEventArgs e) BoneVisual3d targetBone = this.Skeleton.CurrentBone; if (targetBone.BoneName.EndsWith("Left") || targetBone.BoneName.EndsWith("Right")) { - this.MirrorBone(targetBone, false); + this.FlipBone(targetBone, false); } else { - this.MirrorBone(targetBone); + this.FlipBone(targetBone); } targetBone.ReadTransform(true); } - this.IsMirroring = false; + this.IsFlipping = false; } } From f1c7fd5165c0b9f834d1ec23755aa92a91f6dfbb Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sun, 2 May 2021 16:51:44 +1000 Subject: [PATCH 10/12] Fixed aborting process selection causing a service not found exception Fixes https://github.com/imchillin/Anamnesis/issues/339 --- Anamnesis/Core/Memory/MemoryService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Anamnesis/Core/Memory/MemoryService.cs b/Anamnesis/Core/Memory/MemoryService.cs index 147936d00..f800392cc 100644 --- a/Anamnesis/Core/Memory/MemoryService.cs +++ b/Anamnesis/Core/Memory/MemoryService.cs @@ -398,7 +398,9 @@ private async Task GetProcess() App.Current.MainWindow.Topmost = false; proc = ProcessSelector.FindProcess(); - App.Current.MainWindow.Topmost = SettingsService.Current.AlwaysOnTop; + + if (SettingsService.Exists) + App.Current.MainWindow.Topmost = SettingsService.Current.AlwaysOnTop; await Dispatch.NonUiThread(); } From 3136967d55afeb5cc91f6d879aba046216c1dafc Mon Sep 17 00:00:00 2001 From: Ani <56663405+Ani-ki@users.noreply.github.com> Date: Sun, 2 May 2021 21:29:45 +1000 Subject: [PATCH 11/12] Gallery Update --- Anamnesis/Data/Images.json | 236 ++++++++++++++++++++++++++++++++++++- 1 file changed, 234 insertions(+), 2 deletions(-) diff --git a/Anamnesis/Data/Images.json b/Anamnesis/Data/Images.json index b7014de47..bd3d0c935 100644 --- a/Anamnesis/Data/Images.json +++ b/Anamnesis/Data/Images.json @@ -40,7 +40,7 @@ "Author": "yuyu" }, { - "Url": "https://cdn.discordapp.com/attachments/782161117463969793/782350802366496788/Virgo_KH.jpg", + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/828758868879343617/2021-04-04_14-49-24-300_Neneko_FF_Brave_Exvius.png", "Author": "Vana" }, { @@ -168,7 +168,7 @@ "Author": "solyn" }, { - "Url": "https://cdn.discordapp.com/attachments/782161117463969793/783806001697521674/2020-12-02_16-20-41-432_Talim_-_Zuko.png", + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836251533951762472/2AlDgVG8EoF3.png", "Author": "undisclosed" }, { @@ -706,5 +706,237 @@ { "Url": "https://cdn.discordapp.com/attachments/782161117463969793/825570965726822410/Pastel_Sun.png", "Author": "Momo Suzuko" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/826185630736187402/2021-03-14_16-53-20-936_Junkheaven_01.png", + "Author": "kohii" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/826789643608522772/2021-03-31_07-48-00-867_Neneko_Embrace_Bokeh.png", + "Author": "Ilisium" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/827743681061584960/Desktop_Screenshot_2021.03.14_-_21.52.47.18.png", + "Author": "Astrid Hofferson" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/828693808229122148/unknown.png", + "Author": "Lofi" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/829878559782862918/2021-04-05_23-28-41-220_Kryssa_Gameplay.png", + "Author": "Kryssa" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/830900475301330944/ffxiv_dx11_2021-01-20_18-38-42-394_.png", + "Author": "Zella" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/831219790299136010/2021-04-11_2.png", + "Author": "Andreas B" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/832738098596151367/2021-04-16_16-35-37-957_Maya_Rain.png", + "Author": "The Queen" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/832810001961713734/2021-01-22_18-05-16-287_Neneko_Wonderland.png", + "Author": "Min" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/833034823307100221/ffxiv_dx11_2021-04-16_15-15-09-693_1_.png", + "Author": "PrinceMeru" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/833221451099799562/2021-04-06_21-57-30-825_extremely_online_cool_shader_2_electric_boogaloo.jpg", + "Author": "ababababab" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/833277153713061898/2021-04-17_06-15-23-990_Talim_-_Work_it.png", + "Author": "Lionheart" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834116121904021514/2021-04-15_22-32-10-965_Fairy_Whisperwind.png", + "Author": "Fairy" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834134326378496051/2021-04-08_23-04-39-970_Crystal_Sands.png", + "Author": "Solfan" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834215405832503306/2021-02-10_21-35-26-324_EG11_-_06_-_Pastel_Warm.png", + "Author": "Strawberri" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834216914511069234/2021-01-12_17-42-13-756_Neneko_Akatsuki.png", + "Author": "Lhoa" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834323233875427358/2021-01-22_01-04-52-600_EG11_-_05_-_Pastel_Cool.png", + "Author": "SilverRoe" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834351943777517588/2020-10-21_01-21-28_7-EXPERIMENTAL-Arsibra-DSLR-Close-Up.png", + "Author": "arsibra" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834374603220058152/2021-04-21_11-12-24-791_TheFashionista_-_A_Summers_Bliss_2.0.png", + "Author": "AlexHapper" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834381184615317514/2021-04-18_03-12-54-265_Neneko_Haruno.png", + "Author": "NANA OvQ" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834402906673381406/2021-04-21_08-17-27-722_Neneko_Juicy.png", + "Author": "Pheonix" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834405087333580800/ffxiv_dx11_2021-02-05_19-30-51-123_.png", + "Author": "Sin" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834412729632161792/2021-04-20_20-51-51-166_TheFashionista_-_Serenity.png", + "Author": "zoie" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834499255413637140/2021-04-21_14-33-36-360_OkamiAether.png", + "Author": "Bleckness" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834558847787204618/2021-04-21_18-22-53-816_Neneko_Blossom.png", + "Author": "Fury" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834560470387523614/2021-04-22_00-37-03-732_Neneko_Embrace.png", + "Author": "GunbladeWitch" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834582100686274570/2021-04-21_20-10-37-047_Taeyeonnie_Nostalgia.png", + "Author": "peppermint!" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834621451050549288/2021-04-06_19-43-42-899_Neneko_Shinjuku_CityHunter.png", + "Author": "Clair" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834787816923332688/2021-04-21_10-41-44-179_Neneko_Dreamy_Unicorn.png", + "Author": "Aokori" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834795004605890620/2021-04-21_06-15-42-280_Fairy_Daydream.png", + "Author": "Crystia" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834841254286065755/2021-04-22_13-19-37-586_ZF_-_Blossom.png", + "Author": "Arcanumochi" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834842532625121311/2021-04-10_00-55-08-694_Fairy_Queen_of_Demons.png", + "Author": "Random Primal Person" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834976640550305792/2021-04-21_13-37-28-365_Neneko_Adventurer.png", + "Author": "Niko Lake" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/834982656370278430/2021-04-22_22-40-55-928_GlaceEorzea_Clear.png", + "Author": "CalCrazy" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835097614877327370/2021-04-23_11-56-21-601_Talim_-_Sanctuary.png", + "Author": "호랑이" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835168859333066782/FINAL_FANTASY_XIV_22_04_2021_03_08_34_2.png", + "Author": "Hinna Luana" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835495894979313694/2021-04-24_05-10-33-218_Fairy_Lunaris.png", + "Author": "Sellanah Solnec" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835577023371804693/2021-02-03_20-49-56-070_Neneko_Lotus.png", + "Author": "!Leo D." + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835612454159253534/2021-04-24_19-03-44-910_Movie_Magic.png", + "Author": "Arcadia Lunashine" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835860806142263336/2021-04-25_16-50-44-065_R.png", + "Author": "Rainbow" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835909933316046888/Screenshot_2021-04-25_1136181.png", + "Author": "Ichitan" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/835982404430331924/ffxiv_dx11_2021-04-25_21-45-48.png", + "Author": "Mattgibbi" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836017984094208020/2021-04-17_16-56-08-885_Maya_Gridania_life.png", + "Author": "Ralenelle E | V" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836042295140417576/2021-04-25_20-30-48-508_Neneko_Armani_edited.jpg", + "Author": "hellebore hexe" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836047348299202580/2021-04-25_16-39-21-097_Liths_-_The_Realness2.0.png", + "Author": "kiluka" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836065127882293248/unknown.png", + "Author": "Neon Lizard Momo" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836085369493389322/2021-03-10_21-24-06-139_Neneko_Bubblegum.png", + "Author": "Valeriant" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836456139734384650/2021-04-26_19-29-30-519_Maya_Purple_Fog.png", + "Author": "Magic" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836463047328923659/image0.png", + "Author": "Nebyire Shamoon" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836483770320158738/unknown.png", + "Author": "Sagacity" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836697794054979584/2021-04-27_15-10-45-383_Neneko_Akatsuki.png", + "Author": "Soft Bun" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836788849346609182/ffxiv_04272021_202442_238.jpg", + "Author": "Lanira" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/836795240240775188/2021-04-27_23-32-48-054_Neneko_Crystal.png", + "Author": "Lys" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/837144331001004032/2021-04-24_03-13-14-863_Neneko_Sunlight.png", + "Author": "Lavahanje" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/837145710968700948/2021-04-28_18-27-59-250_OkamiAether.png", + "Author": "✧・ﾟ𝒄𝒉𝒂𝒊.*" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/837188372937703434/ffxiv_dx11_2021-04-26_18-05-29-640_.png", + "Author": "zoiney" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/837457990629851186/2021-04-29_10-22-26-998_Leggerless-Universal-Night-Screenshot.png", + "Author": "Leggerless" + }, + { + "Url": "https://cdn.discordapp.com/attachments/782161117463969793/837541444482891796/PaperLanterns.png", + "Author": "ioaella" } ] From 93e166e9e3cdc8ce47b957aa0221624985caab1b Mon Sep 17 00:00:00 2001 From: Yuuki-Walsh Date: Sun, 2 May 2021 21:33:44 +1000 Subject: [PATCH 12/12] Update Tips.json --- Anamnesis/Data/Tips.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Anamnesis/Data/Tips.json b/Anamnesis/Data/Tips.json index d54485b0c..01a38a5df 100644 --- a/Anamnesis/Data/Tips.json +++ b/Anamnesis/Data/Tips.json @@ -18,7 +18,7 @@ { "Text": "The Anamnesis window can be made transparent in the Settings Panel." }, - { + { "Text": "You can change the current theme in the Settings Panel." }, { @@ -28,7 +28,7 @@ "Text": "The Wiki has useful guides to help you with using Anamnesis.", "Url": "https://github.com/imchillin/Anamnesis/wiki" }, - { + { "Text": "Game updates will likely break the tool. Please be patient when this happens, and we will have a fix out ASAP." }, { @@ -57,13 +57,13 @@ { "Text": "You can change the time of day and the weather in the 'World' section." }, - { + { "Text": "You can change the window size in the Settings Panel." }, - { + { "Text": "When it comes to PCs: Friends, Party Members, FC Members and Alliance Raid Members can be manipulated." }, - { + { "Text": "If you ever come across a bug that can be reproduced, please file the issue in our GitHub, ensuring you have provided all the steps on how to reproduce the bug.", "Url": "https://github.com/imchillin/Anamnesis/issues" }, @@ -76,7 +76,7 @@ { "Text": "When using the Pose tab, if you don't have a bone selected you can use the Transform function to change your actor's scale and position." }, - { + { "Text": "Remember to unfreeze time in the GPose menu before trying to change it via Anamnesis." }, { @@ -88,7 +88,7 @@ { "Text": "If you feel that a pose you made looks off, try replicating it yourself, in real life. You'll realise quite quickly how something should or should not bend if you try it yourself." }, - { + { "Text": "You can scale weapons to 0 while in GPose to make them disappear, in case you forgot to hide them earlier." }, { @@ -107,5 +107,8 @@ { "Text": "The XIV Tools Discord's Wiki channel has many useful links and guides to help you use Anamnesis!", "Url": "https://discord.gg/KvGJCCnG8t" + }, + { + "Text": "Hold shift while Anamnesis is starting to reset your settings" } ]