diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index a484739edc..bf61ac00d5 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -24,8 +24,8 @@ namespace BizHawk.MultiClient public partial class MainForm : Form { public bool INTERIM = true; - public const string EMUVERSION = "Version 1.1.2"; - public const string RELEASEDATE = "October 07, 2012"; + public const string EMUVERSION = "Version 1.2.0"; + public const string RELEASEDATE = "October 20, 2012"; private Control renderTarget; private RetainedViewportPanel retainedPanel; public string CurrentlyOpenRom; @@ -2921,7 +2921,7 @@ namespace BizHawk.MultiClient "TI-83", "*.rom;%ARCH%", "Archive Files", "%ARCH%", "Savestate", "*.state", - "Atari 2600 (experimental)", "*.a26;*.bin;%ARCH%", + "Atari 2600", "*.a26;*.bin;%ARCH%", "Genesis (experimental)", "*.gen;*.smd;*.bin;*.md;*.cue;%ARCH%", "Gameboy", "*.gb;*.gbc;%ARCH%", "Colecovision (very experimental)", "*.col;%ARCH%", @@ -2932,13 +2932,14 @@ namespace BizHawk.MultiClient else { ofd.Filter = FormatFilter( - "Rom Files", "*.nes;*.sms;*.gg;*.sg;*.gb;*.gbc;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.rom;*.cue;%ARCH%", + "Rom Files", "*.nes;*.sms;*.gg;*.sg;*.gb;*.gbc;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.rom;*.cue;%ARCH%", "Disc Images", "*.cue", "NES", "*.nes;%ARCH%", "Super NES", "*.smc;*.sfc;%ARCH%", "Gameboy", "*.gb;*.gbc;%ARCH%", "Master System", "*.sms;*.gg;*.sg;%ARCH%", "PC Engine", "*.pce;*.sgx;*.cue;%ARCH%", + "Atari 2600", "*.a26;%ARCH%", "TI-83", "*.rom;%ARCH%", "Archive Files", "%ARCH%", "Savestate", "*.state", diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs index 79e370cc45..ecb1a69296 100644 --- a/BizHawk.MultiClient/config/InputConfig.cs +++ b/BizHawk.MultiClient/config/InputConfig.cs @@ -452,10 +452,7 @@ namespace BizHawk.MultiClient private void InputConfig_Load(object sender, EventArgs e) { - if (Global.MainForm.INTERIM) - { - SystemComboBox.Items.Add("Atari"); //When Atari is ready, add this in the designer instead - } + SystemComboBox.Items.Add("Atari"); //TODO: add this to the designer instead HotkeyMappingList = Global.ClientControls.MappingList(); diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.MultiClient/config/PathConfig.cs index 3babf13539..e42642b56e 100644 --- a/BizHawk.MultiClient/config/PathConfig.cs +++ b/BizHawk.MultiClient/config/PathConfig.cs @@ -145,8 +145,6 @@ namespace BizHawk.MultiClient { var TABPage1 = tabControl1.TabPages[10]; //Hide Int. V tabControl1.Controls.Remove(TABPage1); - var TABPage2 = tabControl1.TabPages[9]; //Hide Atari - tabControl1.Controls.Remove(TABPage2); } switch (Global.Game.System)