Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-10 15:14:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix more issues

Browse source
This commit is contained in:
KillzXGaming 2019-03-23 14:41:59 -04:00
parent f305ed994a
commit 792341cfce
16 changed files with 54 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

2
Switch_FileFormatsMain/FileFormats/BFRES/BfresSwitch.cs
View file

@ -544,7 +544,7 @@ namespace FirstPlugin
bone.RigidMatrixIndex = bn.RigidMatrixIndex;
bone.SmoothMatrixIndex = bn.SmoothMatrixIndex;
bone.BillboardIndex = bn.BillboardIndex;
if (SetParent)
if (!SetParent)
bone.parentIndex = bn.ParentIndex;
bone.scale = new float[3];

2
Switch_FileFormatsMain/FileFormats/BFRES/BfresWiiU.cs
View file

@ -342,7 +342,7 @@ namespace FirstPlugin
bone.SmoothMatrixIndex = bn.SmoothMatrixIndex;
bone.BillboardIndex = bn.BillboardIndex;
if (SetParent)
if (!SetParent)
bone.parentIndex = bn.ParentIndex;
bone.scale = new float[3];
bone.rotation = new float[4];

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View file

Binary file not shown.

6
Switch_Toolbox_Library/Forms/Editors/AnimationPanel.Designer.cs generated
View file

@ -50,7 +50,7 @@
this.button2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.button2.Location = new System.Drawing.Point(17, 7);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(50, 21);
this.button2.Size = new System.Drawing.Size(34, 21);
this.button2.TabIndex = 2;
this.button2.UseVisualStyleBackColor = false;
//
@ -113,9 +113,9 @@
this.animationPlayBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.animationPlayBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.animationPlayBtn.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.animationPlayBtn.Location = new System.Drawing.Point(73, 7);
this.animationPlayBtn.Location = new System.Drawing.Point(57, 7);
this.animationPlayBtn.Name = "animationPlayBtn";
this.animationPlayBtn.Size = new System.Drawing.Size(50, 21);
this.animationPlayBtn.Size = new System.Drawing.Size(31, 21);
this.animationPlayBtn.TabIndex = 1;
this.animationPlayBtn.UseVisualStyleBackColor = false;
this.animationPlayBtn.Click += new System.EventHandler(this.animationPlayBtn_Click);

18
Switch_Toolbox_Library/UpdateProgram.cs
View file

@ -32,7 +32,10 @@ namespace Switch_Toolbox
latest.TargetCommitish,
latest.Assets[0].UpdatedAt.ToString());
if (Runtime.ProgramVersion != latest.TagName)
ParseVersion(latest.TagName);
if (Runtime.ProgramVersion != latest.TagName && Major >= 1)
{
CanUpdate = true;
LatestRelease = latest;
@ -45,6 +48,19 @@ namespace Switch_Toolbox
Console.WriteLine($"Failed to get latest update\n{ex.ToString()}");
}
}
public static int Major;
public static int Minor;
public static int Revision;
static void ParseVersion(string TagName)
{
char[] chars = TagName.ToCharArray();
Major = int.Parse(chars[1].ToString());
}
static async Task GetReleases(GitHubClient client)
{
List<Release> Releases = new List<Release>();

38
Toolbox/MainForm.Designer.cs generated
View file

@ -79,7 +79,7 @@
this.settingsToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(800, 25);
this.menuStrip1.Size = new System.Drawing.Size(1108, 25);
this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1";
//
@ -100,33 +100,33 @@
// newToolStripMenuItem
//
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
this.newToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.newToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.newToolStripMenuItem.Text = "New";
//
// newFromFileToolStripMenuItem
//
this.newFromFileToolStripMenuItem.Name = "newFromFileToolStripMenuItem";
this.newFromFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.newFromFileToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.newFromFileToolStripMenuItem.Text = "New From File";
//
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
this.openToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.openToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.openToolStripMenuItem.Text = "Open";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
// recentToolStripMenuItem
//
this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
this.recentToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.recentToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.recentToolStripMenuItem.Text = "Recent";
//
// saveToolStripMenuItem
//
this.saveToolStripMenuItem.Enabled = false;
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.saveToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.saveToolStripMenuItem.Text = "Save";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
//
@ -134,14 +134,14 @@
//
this.saveAsToolStripMenuItem.Enabled = false;
this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.saveAsToolStripMenuItem.Text = "Save As";
this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.exitToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@ -162,7 +162,7 @@
// compressionToolStripMenuItem
//
this.compressionToolStripMenuItem.Name = "compressionToolStripMenuItem";
this.compressionToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.compressionToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.compressionToolStripMenuItem.Text = "Compression";
//
// experimentalToolStripMenuItem
@ -186,35 +186,35 @@
// cascadeToolStripMenuItem
//
this.cascadeToolStripMenuItem.Name = "cascadeToolStripMenuItem";
this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.cascadeToolStripMenuItem.Text = "Cascade";
this.cascadeToolStripMenuItem.Click += new System.EventHandler(this.cascadeToolStripMenuItem_Click);
//
// minimizeToolStripMenuItem
//
this.minimizeToolStripMenuItem.Name = "minimizeToolStripMenuItem";
this.minimizeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.minimizeToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.minimizeToolStripMenuItem.Text = "Minimize";
this.minimizeToolStripMenuItem.Click += new System.EventHandler(this.minimizeToolStripMenuItem_Click);
//
// maximizeToolStripMenuItem
//
this.maximizeToolStripMenuItem.Name = "maximizeToolStripMenuItem";
this.maximizeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.maximizeToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.maximizeToolStripMenuItem.Text = "Maximize";
this.maximizeToolStripMenuItem.Click += new System.EventHandler(this.maximizeToolStripMenuItem_Click);
//
// closeToolStripMenuItem
//
this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
this.closeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.closeToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.closeToolStripMenuItem.Text = "Close";
this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
//
// closeAllToolStripMenuItem
//
this.closeAllToolStripMenuItem.Name = "closeAllToolStripMenuItem";
this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.closeAllToolStripMenuItem.Text = "Close All";
this.closeAllToolStripMenuItem.Click += new System.EventHandler(this.closeAllToolStripMenuItem_Click);
//
@ -249,7 +249,7 @@
this.stPanel1.Dock = System.Windows.Forms.DockStyle.Top;
this.stPanel1.Location = new System.Drawing.Point(0, 0);
this.stPanel1.Name = "stPanel1";
this.stPanel1.Size = new System.Drawing.Size(800, 25);
this.stPanel1.Size = new System.Drawing.Size(1108, 25);
this.stPanel1.TabIndex = 5;
//
// tabForms
@ -259,7 +259,7 @@
this.tabForms.myBackColor = System.Drawing.Color.Empty;
this.tabForms.Name = "tabForms";
this.tabForms.SelectedIndex = 0;
this.tabForms.Size = new System.Drawing.Size(800, 24);
this.tabForms.Size = new System.Drawing.Size(1108, 24);
this.tabForms.TabIndex = 9;
this.tabForms.Visible = false;
this.tabForms.SelectedIndexChanged += new System.EventHandler(this.tabForms_SelectedIndexChanged);
@ -284,7 +284,7 @@
this.stPanel2.Dock = System.Windows.Forms.DockStyle.Top;
this.stPanel2.Location = new System.Drawing.Point(0, 25);
this.stPanel2.Name = "stPanel2";
this.stPanel2.Size = new System.Drawing.Size(800, 30);
this.stPanel2.Size = new System.Drawing.Size(1108, 30);
this.stPanel2.TabIndex = 7;
//
// stToolStrip1
@ -294,7 +294,7 @@
this.toolStripButton1});
this.stToolStrip1.Location = new System.Drawing.Point(0, 0);
this.stToolStrip1.Name = "stToolStrip1";
this.stToolStrip1.Size = new System.Drawing.Size(800, 30);
this.stToolStrip1.Size = new System.Drawing.Size(1108, 30);
this.stToolStrip1.TabIndex = 0;
this.stToolStrip1.Text = "stToolStrip1";
//
@ -314,7 +314,7 @@
this.AllowDrop = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.ClientSize = new System.Drawing.Size(1108, 621);
this.Controls.Add(this.tabForms);
this.Controls.Add(this.stPanel2);
this.Controls.Add(this.stPanel1);

6
Toolbox/MainForm.cs
View file

@ -102,7 +102,6 @@ namespace Toolbox
if (int.TryParse(Version[0].ToString(), out major))
{
if (major <= 2)
{
Runtime.UseLegacyGL = true;
@ -111,9 +110,10 @@ namespace Toolbox
}
#region Updater
bool UsePrompt = true;
private void Application_Idle(object sender, EventArgs e)
{
if (UpdateProgram.CanUpdate && Runtime.EnableVersionCheck)
if (UpdateProgram.CanUpdate && Runtime.EnableVersionCheck && UsePrompt)
{
//Prompt once for the user to update the tool.
DialogResult result;
@ -126,6 +126,8 @@ namespace Toolbox
{
UpdateApplication();
}
else
UsePrompt = false;
}
}
private void UpdateApplication()

6
Toolbox/Toolbox.csproj
View file

@ -373,6 +373,12 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Projects\Recent\DUMMY.txt" />
<Content Include="x64\DirectXTexNetImpl.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="x86\DirectXTexNetImpl.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\Save.png" />
<Content Include="Switch_Toolbox.csproj.user" />
<Content Include="Tool.ico" />

3
Toolbox/UpdateProgram.cs
View file

@ -32,6 +32,9 @@ namespace Toolbox
latest.TargetCommitish,
latest.Assets[0].UpdatedAt.ToString());
if (latest.TagName == "v0.8.89")
return;
if (Runtime.ProgramVersion != latest.TagName)
{
CanUpdate = true;

BIN
Toolbox/x64/DirectXTexNetImpl.dll Normal file
View file

Binary file not shown.

BIN
Toolbox/x86/DirectXTexNetImpl.dll Normal file
View file

Binary file not shown.