diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 6ad2219de6..8b5a03d965 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -415,6 +415,10 @@ + + + + diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 64cff2d1fb..6e12aeb991 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -56,6 +56,9 @@ public bool SoundEnabled = true; public bool MuteFrameAdvance = true; + // Lua Console + public RecentFiles RecentLua = new RecentFiles(8); + // RamWatch Settings public bool AutoLoadRamWatch = false; public RecentFiles RecentWatches = new RecentFiles(8); diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 67d621d864..868501dd28 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -143,6 +143,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Pause { + get { + object obj = ResourceManager.GetObject("Pause", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap PCEngineController { get { object obj = ResourceManager.GetObject("PCEngineController", resourceCulture); @@ -150,6 +157,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Play { + get { + object obj = ResourceManager.GetObject("Play", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap poke { get { object obj = ResourceManager.GetObject("poke", resourceCulture); @@ -185,6 +199,20 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Stop { + get { + object obj = ResourceManager.GetObject("Stop", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap ToolBox { + get { + object obj = ResourceManager.GetObject("ToolBox", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap TruncateFromFile { get { object obj = ResourceManager.GetObject("TruncateFromFile", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index b848d5a793..df9f0b498a 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -606,4 +606,16 @@ ..\images\Debugger.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\ToolBox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/ToolBox.png b/BizHawk.MultiClient/images/ToolBox.png new file mode 100644 index 0000000000..aed1f9c643 Binary files /dev/null and b/BizHawk.MultiClient/images/ToolBox.png differ