diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index e4e48a6d..6115c33c 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 85a8ef57..a1d45946 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 17731c44..5f746f76 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/FileFormats/Collision/KCL.cs b/Switch_FileFormatsMain/FileFormats/Collision/KCL.cs index 3421d370..84a22af2 100644 --- a/Switch_FileFormatsMain/FileFormats/Collision/KCL.cs +++ b/Switch_FileFormatsMain/FileFormats/Collision/KCL.cs @@ -55,22 +55,8 @@ namespace FirstPlugin public KCL() { - OdysseyPresetToolstrip = new STToolStripItem("Mario Odyssey", PresetChanged) { Checked = true }; - Mk8PresetToolstrip = new STToolStripItem("Mario Kart 8 Wii U / Deluxe", PresetChanged); - Splatoon2PresetToolstrip = new STToolStripItem("Splatoon 2", PresetChanged); - SplatoonPresetToolstrip = new STToolStripItem("Splatoon", PresetChanged); - OtherPresetToolstrip = new STToolStripItem("Other", PresetChanged); - - STToolStripItem GamePresetToolstrip = new STToolStripItem("Game Preset"); - GamePresetToolstrip.DropDownItems.Add(OdysseyPresetToolstrip); - GamePresetToolstrip.DropDownItems.Add(Mk8PresetToolstrip); - GamePresetToolstrip.DropDownItems.Add(Splatoon2PresetToolstrip); - GamePresetToolstrip.DropDownItems.Add(SplatoonPresetToolstrip); - GamePresetToolstrip.DropDownItems.Add(OtherPresetToolstrip); - ContextMenuStrip = new STContextMenuStrip(); ContextMenuStrip.Items.Add(new STToolStripItem("Save", Save)); - ContextMenuStrip.Items.Add(GamePresetToolstrip); ContextMenuStrip.Items.Add(new STToolStripItem("Export", Export)); ContextMenuStrip.Items.Add(new STToolStripItem("Replace", Replace)); EndiannessToolstrip = new STToolStripItem("Big Endian Mode", SwapEndianess) { Checked = true }; @@ -79,26 +65,6 @@ namespace FirstPlugin IFileInfo = new IFileInfo(); } - public void PresetChanged(object sender, EventArgs args) - { - OdysseyPresetToolstrip.Checked = false; - Mk8PresetToolstrip.Checked = false; - Splatoon2PresetToolstrip.Checked = false; - SplatoonPresetToolstrip.Checked = false; - OtherPresetToolstrip.Checked = false; - - if (sender is STToolStipMenuItem) { - ((STToolStipMenuItem)sender).Checked = true; - } - - ApplyPresets(data); - } - - private void ApplyPresets(byte[] Data) - { - - } - public void Load(System.IO.Stream stream) { Text = FileName; diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 93186947..fb640db1 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_Toolbox_Library/Forms/Editors/Animation/AnimationPanel.cs b/Switch_Toolbox_Library/Forms/Editors/Animation/AnimationPanel.cs index 44392022..f2c74047 100644 --- a/Switch_Toolbox_Library/Forms/Editors/Animation/AnimationPanel.cs +++ b/Switch_Toolbox_Library/Forms/Editors/Animation/AnimationPanel.cs @@ -77,7 +77,6 @@ namespace Switch_Toolbox.Library totalFrame.Value = frameCount; currentFrameUpDown.Maximum = frameCount; animationTrackBar.FrameCount = frameCount; - currentFrameUpDown.Value = 1; currentFrameUpDown.Value = 0; } } @@ -188,7 +187,7 @@ namespace Switch_Toolbox.Library else Stop(); } - else + else if (!animationTrackBar.Locked) { currentFrameUpDown.Value++; } @@ -348,7 +347,7 @@ namespace Switch_Toolbox.Library //Add frames to the playing animation - currentAnimation.Frame += 1f; + currentAnimation.Frame += frameNum; //Reset it when it reaches the total frame count if (currentAnimation.Frame >= currentAnimation.FrameCount) @@ -363,11 +362,11 @@ namespace Switch_Toolbox.Library currentFrameUpDown.Value = totalFrame.Value; //Check locked state current frame will change during playing - if (animationTrackBar.Locked == false) + if (!animationTrackBar.Locked) { animationTrackBar.CurrentFrame = (int)currentFrameUpDown.Value; - OnFrameAdvanced(); } + OnFrameAdvanced(); } public void AnimationPanel_FormClosed() diff --git a/Toolbox/Lib/KCLExt.dll b/Toolbox/Lib/KCLExt.dll index 6951e9bb..7e916b74 100644 Binary files a/Toolbox/Lib/KCLExt.dll and b/Toolbox/Lib/KCLExt.dll differ diff --git a/Toolbox/Lib/KCLExt.pdb b/Toolbox/Lib/KCLExt.pdb index 01a511db..1be91be8 100644 Binary files a/Toolbox/Lib/KCLExt.pdb and b/Toolbox/Lib/KCLExt.pdb differ diff --git a/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt b/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt index fd6479b7..d15f45b2 100644 --- a/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt +++ b/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt @@ -31,3 +31,11 @@ C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.exe C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.exe C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.pdb C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Octokit.dll +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe.config +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.pdb +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csprojAssemblyReference.cache +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CoreCompileInputs.cache +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CopyComplete +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.exe +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.pdb