ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved it to N64, hope all is right

This commit is contained in:
masterofpuppets152001 2013-05-04 17:56:24 +00:00
parent 47cf4c3cb9
commit 9c80ea5ec7
6 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -441,10 +441,10 @@
<Compile Include="tools\AnalogControlPanel.cs"> <Compile Include="tools\AnalogControlPanel.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="tools\N64VideoPluginconfig.cs"> <Compile Include="N64tools\N64VideoPluginconfig.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="tools\N64VideoPluginconfig.Designer.cs"> <Compile Include="N64tools\N64VideoPluginconfig.Designer.cs">
<DependentUpon>N64VideoPluginconfig.cs</DependentUpon> <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="tools\HexColor.cs"> <Compile Include="tools\HexColor.cs">
@ -644,7 +644,7 @@
<EmbeddedResource Include="SNESTools\SNESOptions.resx"> <EmbeddedResource Include="SNESTools\SNESOptions.resx">
<DependentUpon>SNESOptions.cs</DependentUpon> <DependentUpon>SNESOptions.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="tools\N64VideoPluginconfig.resx"> <EmbeddedResource Include="N64tools\N64VideoPluginconfig.resx">
<DependentUpon>N64VideoPluginconfig.cs</DependentUpon> <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="tools\HexColor.resx"> <EmbeddedResource Include="tools\HexColor.resx">

52
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

@ -285,6 +285,7 @@
this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.n64ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.n64ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.videoConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.videoConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tempN64PluginControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -332,7 +333,6 @@
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
this.tempN64PluginControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout(); this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
@ -1799,8 +1799,7 @@
this.luaConsoleToolStripMenuItem, this.luaConsoleToolStripMenuItem,
this.cheatsToolStripMenuItem, this.cheatsToolStripMenuItem,
this.toolStripSeparator29, this.toolStripSeparator29,
this.createDualGBXMLToolStripMenuItem, this.createDualGBXMLToolStripMenuItem});
this.tempN64PluginControlToolStripMenuItem});
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19);
this.toolsToolStripMenuItem.Text = "&Tools"; this.toolsToolStripMenuItem.Text = "&Tools";
@ -1810,20 +1809,20 @@
// //
this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Text = "&Tool Box";
this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(206, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(186, 6);
// //
// rAMWatchToolStripMenuItem // rAMWatchToolStripMenuItem
// //
this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
// //
@ -1831,7 +1830,7 @@
// //
this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
// //
@ -1839,7 +1838,7 @@
// //
this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
// //
@ -1847,7 +1846,7 @@
// //
this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
// //
@ -1855,7 +1854,7 @@
// //
this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil;
this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem";
this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; this.traceLoggerToolStripMenuItem.Text = "Trace &Logger";
this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click);
// //
@ -1863,7 +1862,7 @@
// //
this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem";
this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Text = "&TAStudio";
this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click);
// //
@ -1871,20 +1870,20 @@
// //
this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem";
this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; this.virtualPadToolStripMenuItem.Text = "Virtual Pad";
this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click);
// //
// toolStripSeparator11 // toolStripSeparator11
// //
this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(206, 6); this.toolStripSeparator11.Size = new System.Drawing.Size(186, 6);
// //
// luaConsoleToolStripMenuItem // luaConsoleToolStripMenuItem
// //
this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Text = "Lua Console";
this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
// //
@ -1892,19 +1891,19 @@
// //
this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Text = "Cheats";
this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
// //
// toolStripSeparator29 // toolStripSeparator29
// //
this.toolStripSeparator29.Name = "toolStripSeparator29"; this.toolStripSeparator29.Name = "toolStripSeparator29";
this.toolStripSeparator29.Size = new System.Drawing.Size(206, 6); this.toolStripSeparator29.Size = new System.Drawing.Size(186, 6);
// //
// createDualGBXMLToolStripMenuItem // createDualGBXMLToolStripMenuItem
// //
this.createDualGBXMLToolStripMenuItem.Name = "createDualGBXMLToolStripMenuItem"; this.createDualGBXMLToolStripMenuItem.Name = "createDualGBXMLToolStripMenuItem";
this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(209, 22); this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.createDualGBXMLToolStripMenuItem.Text = "Create Dual GB XML..."; this.createDualGBXMLToolStripMenuItem.Text = "Create Dual GB XML...";
this.createDualGBXMLToolStripMenuItem.Click += new System.EventHandler(this.createDualGBXMLToolStripMenuItem_Click); this.createDualGBXMLToolStripMenuItem.Click += new System.EventHandler(this.createDualGBXMLToolStripMenuItem_Click);
// //
@ -2466,7 +2465,8 @@
// n64ToolStripMenuItem // n64ToolStripMenuItem
// //
this.n64ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.n64ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.videoConfigToolStripMenuItem}); this.videoConfigToolStripMenuItem,
this.tempN64PluginControlToolStripMenuItem});
this.n64ToolStripMenuItem.Name = "n64ToolStripMenuItem"; this.n64ToolStripMenuItem.Name = "n64ToolStripMenuItem";
this.n64ToolStripMenuItem.Size = new System.Drawing.Size(40, 19); this.n64ToolStripMenuItem.Size = new System.Drawing.Size(40, 19);
this.n64ToolStripMenuItem.Text = "N64"; this.n64ToolStripMenuItem.Text = "N64";
@ -2474,10 +2474,17 @@
// videoConfigToolStripMenuItem // videoConfigToolStripMenuItem
// //
this.videoConfigToolStripMenuItem.Name = "videoConfigToolStripMenuItem"; this.videoConfigToolStripMenuItem.Name = "videoConfigToolStripMenuItem";
this.videoConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.videoConfigToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
this.videoConfigToolStripMenuItem.Text = "Video Settings"; this.videoConfigToolStripMenuItem.Text = "Video Settings";
this.videoConfigToolStripMenuItem.Click += new System.EventHandler(this.videoConfigToolStripMenuItem_Click); this.videoConfigToolStripMenuItem.Click += new System.EventHandler(this.videoConfigToolStripMenuItem_Click);
// //
// tempN64PluginControlToolStripMenuItem
//
this.tempN64PluginControlToolStripMenuItem.Name = "tempN64PluginControlToolStripMenuItem";
this.tempN64PluginControlToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
this.tempN64PluginControlToolStripMenuItem.Text = "Temp N64 Plugin Control";
this.tempN64PluginControlToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click);
//
// helpToolStripMenuItem // helpToolStripMenuItem
// //
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -2882,13 +2889,6 @@
this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Text = "Show Menu";
this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
// //
// tempN64PluginControlToolStripMenuItem
//
this.tempN64PluginControlToolStripMenuItem.Name = "tempN64PluginControlToolStripMenuItem";
this.tempN64PluginControlToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
this.tempN64PluginControlToolStripMenuItem.Text = "Temp N64 Plugin Control";
this.tempN64PluginControlToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);

3
BizHawk.MultiClient/MainForm.cs
View File

@ -5394,7 +5394,8 @@ namespace BizHawk.MultiClient
private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e) private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e)
{ {
new BizHawk.MultiClient.tools.N64VideoPluginconfig().ShowDialog(); new BizHawk.MultiClient.N64VideoPluginconfig().ShowDialog();
} }
} }
} }

2
BizHawk.MultiClient/tools/N64VideoPluginconfig.Designer.cs → BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.MultiClient.tools namespace BizHawk.MultiClient
{ {
partial class N64VideoPluginconfig partial class N64VideoPluginconfig
{ {

2
BizHawk.MultiClient/tools/N64VideoPluginconfig.cs → BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
View File

@ -7,7 +7,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
namespace BizHawk.MultiClient.tools namespace BizHawk.MultiClient
{ {
public partial class N64VideoPluginconfig : Form public partial class N64VideoPluginconfig : Form
{ {

0
BizHawk.MultiClient/tools/N64VideoPluginconfig.resx → BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx
View File