From 03ac8e3fe44679af86871c9b6ded0c658b228806 Mon Sep 17 00:00:00 2001 From: Asnivor Date: Mon, 25 Sep 2017 20:03:33 +0100 Subject: [PATCH 01/19] removed some startup code to see if this helps #188 --- MedLaunch/App.xaml.cs | 5 ++++- .../ExternalAssemblies/MednaNetAPIClient.dll | Bin 31744 -> 31744 bytes MedLaunch/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MedLaunch/App.xaml.cs b/MedLaunch/App.xaml.cs index d84d44b..18a1911 100644 --- a/MedLaunch/App.xaml.cs +++ b/MedLaunch/App.xaml.cs @@ -91,6 +91,8 @@ private void ApplicationStart(object sender, StartupEventArgs e) /* is the OS x64 or x86? */ + + /* // determine windows install drive letter string letter = Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.System)); @@ -106,7 +108,8 @@ private void ApplicationStart(object sender, StartupEventArgs e) IsX86 = true; } - + */ + IsX86 = false; var splashScreen = new SplashScreen(@"Data\Graphics\mediconsplash-new.png"); splashScreen.Show(false); Current.ShutdownMode = ShutdownMode.OnExplicitShutdown; diff --git a/MedLaunch/ExternalAssemblies/MednaNetAPIClient.dll b/MedLaunch/ExternalAssemblies/MednaNetAPIClient.dll index 47a375d70e904e893c699b329ce84d7a13cc123e..0530a8462c62c497657d5cfa9871e3225a69dcb0 100644 GIT binary patch delta 6792 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 Date: Mon, 25 Sep 2017 20:14:04 +0100 Subject: [PATCH 02/19] commenting out vcredist check code to see if it helps #188 --- MedLaunch/Windows/InitWindow.xaml.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MedLaunch/Windows/InitWindow.xaml.cs b/MedLaunch/Windows/InitWindow.xaml.cs index bdb9765..b31b772 100644 --- a/MedLaunch/Windows/InitWindow.xaml.cs +++ b/MedLaunch/Windows/InitWindow.xaml.cs @@ -56,6 +56,8 @@ private void Init() SetupDirectories.Go(); /* check that pre-reqs are installed */ + + /* UpdateStatus("Scanning for pre-requisites...", true); UpdateStatus("Visual C++ 2010 x86 redist... ", true); @@ -113,6 +115,8 @@ private void Init() } } + */ + // Check whether database exists UpdateStatus("Checking whether there is an existing database present", true); Task.Delay(1); From 005a74e070d05d8a390f2c34216a345f0d80562f Mon Sep 17 00:00:00 2001 From: Asnivor Date: Mon, 25 Sep 2017 20:28:54 +0100 Subject: [PATCH 03/19] Reverting test changes --- MedLaunch/App.xaml.cs | 6 +++--- MedLaunch/Windows/InitWindow.xaml.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MedLaunch/App.xaml.cs b/MedLaunch/App.xaml.cs index 18a1911..6a43cc2 100644 --- a/MedLaunch/App.xaml.cs +++ b/MedLaunch/App.xaml.cs @@ -92,7 +92,7 @@ private void ApplicationStart(object sender, StartupEventArgs e) /* is the OS x64 or x86? */ - /* + // determine windows install drive letter string letter = Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.System)); @@ -108,7 +108,7 @@ private void ApplicationStart(object sender, StartupEventArgs e) IsX86 = true; } - */ + IsX86 = false; var splashScreen = new SplashScreen(@"Data\Graphics\mediconsplash-new.png"); splashScreen.Show(false); @@ -139,7 +139,7 @@ private void ApplicationStart(object sender, StartupEventArgs e) // instantiate ScrapeDB //ScrapedData = new ScrapeDB(); - ScrapeDB sdb = new ScrapeDB(); + //ScrapeDB sdb = new ScrapeDB(); diff --git a/MedLaunch/Windows/InitWindow.xaml.cs b/MedLaunch/Windows/InitWindow.xaml.cs index b31b772..abaf26e 100644 --- a/MedLaunch/Windows/InitWindow.xaml.cs +++ b/MedLaunch/Windows/InitWindow.xaml.cs @@ -57,7 +57,7 @@ private void Init() /* check that pre-reqs are installed */ - /* + UpdateStatus("Scanning for pre-requisites...", true); UpdateStatus("Visual C++ 2010 x86 redist... ", true); @@ -115,7 +115,7 @@ private void Init() } } - */ + // Check whether database exists UpdateStatus("Checking whether there is an existing database present", true); From 86765b2851a7fb2e2acbb2195a1c43655f618d31 Mon Sep 17 00:00:00 2001 From: Asnivor Date: Mon, 25 Sep 2017 22:21:38 +0100 Subject: [PATCH 04/19] fixed transparency issue - #189 --- MedLaunch/Classes/MednaNet/DiscordHandler.cs | 2 +- MedLaunch/MainWindow.xaml | 2 +- MedLaunch/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MedLaunch/Classes/MednaNet/DiscordHandler.cs b/MedLaunch/Classes/MednaNet/DiscordHandler.cs index 7849d59..3b11aed 100644 --- a/MedLaunch/Classes/MednaNet/DiscordHandler.cs +++ b/MedLaunch/Classes/MednaNet/DiscordHandler.cs @@ -463,7 +463,7 @@ public async void SendMessage(string message) }); // post locally (not wait for next poll) - //LocalPost(newMessage); + LocalPost(newMessage); } catch (Exception ex) { APIDisconnected(ex); return; } diff --git a/MedLaunch/MainWindow.xaml b/MedLaunch/MainWindow.xaml index d3ff450..2bfa196 100644 --- a/MedLaunch/MainWindow.xaml +++ b/MedLaunch/MainWindow.xaml @@ -429,7 +429,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro --> - + diff --git a/MedLaunch/Properties/AssemblyInfo.cs b/MedLaunch/Properties/AssemblyInfo.cs index e3f29aa..305d660 100644 --- a/MedLaunch/Properties/AssemblyInfo.cs +++ b/MedLaunch/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.5.18.2")] -[assembly: AssemblyFileVersion("0.5.18.2")] +[assembly: AssemblyVersion("0.5.18.3")] +[assembly: AssemblyFileVersion("0.5.18.3")] From f62ac34fa31417229b2908ac0a0268ef1be6a191 Mon Sep 17 00:00:00 2001 From: Asnivor Date: Mon, 25 Sep 2017 22:22:31 +0100 Subject: [PATCH 05/19] fixed transparency issue --- BuildTools/ChangeLog/default.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildTools/ChangeLog/default.md b/BuildTools/ChangeLog/default.md index 4d03120..6d72df5 100644 --- a/BuildTools/ChangeLog/default.md +++ b/BuildTools/ChangeLog/default.md @@ -6,7 +6,7 @@ title: Changelog ------------------------------------ #### Development Build Changes ([Dev](https://github.com/Asnivor/MedLaunch/tree/dev) branch) - [![Build status](https://ci.appveyor.com/api/projects/status/4maii9la7yb72bw8/branch/dev?svg=true)](https://ci.appveyor.com/project/Asnivor/medlaunch/branch/dev/artifacts) ------------------------------------ -* None as yet +* Fixed UI transparency issue ##### [0.5.18.1](https://medlaunch.info/releases/0-5-18-1) ###### 2017-09-25 From 87eb21df5927049ea79d63ea75f61afca5bf803c Mon Sep 17 00:00:00 2001 From: Asnivor Date: Tue, 26 Sep 2017 06:25:19 +0100 Subject: [PATCH 06/19] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1dfa46e..bf2732e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ **MedLaunch** is a .NET (Windows only) front-end for the excellent [Mednafen](http://mednafen.fobby.net/) multi-system emulator. ### Production Releases -* Latest Production Version: 0.5.8.0 +* Latest Production Version: 0.5.18.1 * Direct Production Download: [LATEST](https://downloads.medlaunch.info/latest) * Compatible with Mednafen: 0.9.39.x - 0.9.48 @@ -77,7 +77,6 @@ Bugs/Suggestions/Feature Requests can be posted on the GitHub [Issue Tracker](ht * Imports all standard ROM formats that mednafen supports * Extended archive support - will import single or multiple ROMs from within .zip or .7z files * **Auto scan and import of Disc based games (PSX, Saturn, PCFX & PCE-CD)** - * Multi-disc games must have their files residing in the same directory or sub-directory * Auto-generation of .m3u playlist files for multi-disc games * **DAT data lookup on import** * MedLaunch ships with a DAT database that combines NoIntro, Tosec, PsxDataCenter & Satakore information that enables detailed information (Country, Year, Publisher etc) to be populated in the games library upon import From 31ee0fab24bc4f52eab7c67742745572a084e82c Mon Sep 17 00:00:00 2001 From: Asnivor Date: Tue, 26 Sep 2017 21:41:55 +0100 Subject: [PATCH 07/19] Update to discord chat --- BuildTools/ChangeLog/default.md | 2 +- MedLaunch/Classes/MednaNet/DiscordHandler.cs | 2 +- MedLaunch/Classes/MednaNet/DiscordUsers.cs | 4 ++-- MedLaunch/Classes/MednaNet/MednaNetAPI.cs | 2 +- .../ExternalAssemblies/MednaNetAPIClient.dll | Bin 31744 -> 31744 bytes appveyor.yml | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BuildTools/ChangeLog/default.md b/BuildTools/ChangeLog/default.md index 6d72df5..7c8e2d3 100644 --- a/BuildTools/ChangeLog/default.md +++ b/BuildTools/ChangeLog/default.md @@ -6,7 +6,7 @@ title: Changelog ------------------------------------ #### Development Build Changes ([Dev](https://github.com/Asnivor/MedLaunch/tree/dev) branch) - [![Build status](https://ci.appveyor.com/api/projects/status/4maii9la7yb72bw8/branch/dev?svg=true)](https://ci.appveyor.com/project/Asnivor/medlaunch/branch/dev/artifacts) ------------------------------------ -* Fixed UI transparency issue +* (BugFix) - Fixed UI transparency issue ##### [0.5.18.1](https://medlaunch.info/releases/0-5-18-1) ###### 2017-09-25 diff --git a/MedLaunch/Classes/MednaNet/DiscordHandler.cs b/MedLaunch/Classes/MednaNet/DiscordHandler.cs index 3b11aed..9935780 100644 --- a/MedLaunch/Classes/MednaNet/DiscordHandler.cs +++ b/MedLaunch/Classes/MednaNet/DiscordHandler.cs @@ -212,7 +212,7 @@ private async void GetUsersAsync() if (u.discordId == null) ct = ClientType.medlaunch; - DVH.users.UpdateUser(u.id, u.username, ct, true); + DVH.users.UpdateUser(u.userId, u.username, ct, true); } DVH.UpdateUsers(); diff --git a/MedLaunch/Classes/MednaNet/DiscordUsers.cs b/MedLaunch/Classes/MednaNet/DiscordUsers.cs index 8c86f39..4066f72 100644 --- a/MedLaunch/Classes/MednaNet/DiscordUsers.cs +++ b/MedLaunch/Classes/MednaNet/DiscordUsers.cs @@ -99,7 +99,7 @@ public DiscordUsers() */ } - public void UpdateUser(int userId, string userName, ClientType clientType, bool isOnline) + public void UpdateUser(string userId, string userName, ClientType clientType, bool isOnline) { var lookup = Users.Where(a => a.UserId == userId).FirstOrDefault(); @@ -125,7 +125,7 @@ public void UpdateUser(int userId, string userName, ClientType clientType, bool public class DiscordUser { - public int UserId { get; set; } + public string UserId { get; set; } public string UserName { get; set; } public ClientType clientType { get; set; } public bool IsOnline { get; set; } diff --git a/MedLaunch/Classes/MednaNet/MednaNetAPI.cs b/MedLaunch/Classes/MednaNet/MednaNetAPI.cs index 3f5b11f..f70aebd 100644 --- a/MedLaunch/Classes/MednaNet/MednaNetAPI.cs +++ b/MedLaunch/Classes/MednaNet/MednaNetAPI.cs @@ -241,7 +241,7 @@ public async void DoPoll() if (u.discordId == null) ct = ClientType.medlaunch; - DVH.users.UpdateUser(u.id, u.username, ct, true); + DVH.users.UpdateUser(u.userId, u.username, ct, true); } // Update the UI diff --git a/MedLaunch/ExternalAssemblies/MednaNetAPIClient.dll b/MedLaunch/ExternalAssemblies/MednaNetAPIClient.dll index 0530a8462c62c497657d5cfa9871e3225a69dcb0..8ceefaf726c93c8dc89d340bf6ef9deb21d16d29 100644 GIT binary patch delta 918 zcmY+DOK1~O6o${8q)BFC5`&_ZNkfaJO(jW3lh`CC&7(<^P$Xy;p_?MO5En|Zu@XU= zfM`U8##LACe+kVBK?3reaLPS%-B$0o*7<2yig&={<^+p|P2LIB z*5pyE1Sfb08cC20ulYeJwI*I`5G458nhxrh_`@I_Y9@cH_6sg3wWe)NpWuO)eeL&Y zU+!LA0-+?Zzc-f8(&i9#+^Pko+teLi4yxlYxP)h>?MzK*NH8fopOSm+j^STnQ%i zH5xz-3~dr8c|19F8KyvZ4BL3Waq2PLf$~gQn7Q;AbTq*#84P$=aq2VFKzW?(yj%th zXP`V~?j4+l3@Ta>m2a8Fxr`ZVpuFE~YFwraE7V~2u`!r4T;T&tK4jd=58`f_+-omw zxkCq}1R`d^um#Gy%dWs+fuh}#VT&F@C6G7yp}jP}i~&N-3Mj_yAZ;mOgb=evG0_^u zL>mSh6NE||pze4FY5pf>2r*lrSSQd#P$O;0;z`prpZ8B zVWOfKFx&8KD&=FGXuva>udIPn5-1KdjX`qr^fFIIW+MjE&5z3)!Hmi2m8Kwp$@42S PnM8~?3s$`cYGVfg#rW86 diff --git a/appveyor.yml b/appveyor.yml index 51fc04d..ea49928 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ branches: - dev - master +skip_tags: true configuration: Release shallow_clone: false environment: From ebc1f96d6682d0b547289af510977712ea760992 Mon Sep 17 00:00:00 2001 From: Steve Burgess Date: Thu, 28 Sep 2017 21:29:22 +0100 Subject: [PATCH 08/19] Removed the setting of the ScrollView visibility to collapsed and stop sidebarColumn column definition's width being set to gridlength(0) --- MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs b/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs index 04da44e..a9ff6c1 100644 --- a/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs +++ b/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs @@ -47,9 +47,9 @@ public static void UpdateSidebar() //mw.sidebarColumn.Width = new GridLength(0); ScrollViewer sv = (ScrollViewer)mw.FindName("srcSidebar"); - sv.Visibility = Visibility.Collapsed; + //sv.Visibility = Visibility.Collapsed; ColumnDefinition cd = (ColumnDefinition)mw.FindName("sidebarColumn"); - cd.Width = new GridLength(0); + //cd.Width = new GridLength(0); // hide individual images as well. // lists of gamesdb related controls From f42884eb38857df1a9fa2d50a6635edd5c0020a7 Mon Sep 17 00:00:00 2001 From: Asnivor Date: Fri, 29 Sep 2017 08:55:43 +0100 Subject: [PATCH 09/19] Update appveyor build config --- MedLaunch/MainWindow.xaml | 3 +++ appveyor.yml | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MedLaunch/MainWindow.xaml b/MedLaunch/MainWindow.xaml index 2bfa196..65e1c95 100644 --- a/MedLaunch/MainWindow.xaml +++ b/MedLaunch/MainWindow.xaml @@ -11252,6 +11252,9 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro + + + diff --git a/appveyor.yml b/appveyor.yml index ea49928..edde593 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,4 @@ version: 'MedLaunch-{branch}.{build}' -branches: - only: - - dev - - master - skip_tags: true configuration: Release shallow_clone: false @@ -41,4 +36,6 @@ deploy: artifact: '$(ML_ARTIFACT_NAME_NEW)' draft: true prerelease: false - force_update: true \ No newline at end of file + force_update: true + on: + branch: master, dev From 2561a1df0f2ee0e18ba013d130918002578d3f84 Mon Sep 17 00:00:00 2001 From: Asnivor Date: Fri, 29 Sep 2017 16:08:34 +0100 Subject: [PATCH 10/19] Updated website changelog --- BuildTools/ChangeLog/default.md | 1 + appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BuildTools/ChangeLog/default.md b/BuildTools/ChangeLog/default.md index 7c8e2d3..26c972d 100644 --- a/BuildTools/ChangeLog/default.md +++ b/BuildTools/ChangeLog/default.md @@ -7,6 +7,7 @@ title: Changelog #### Development Build Changes ([Dev](https://github.com/Asnivor/MedLaunch/tree/dev) branch) - [![Build status](https://ci.appveyor.com/api/projects/status/4maii9la7yb72bw8/branch/dev?svg=true)](https://ci.appveyor.com/project/Asnivor/medlaunch/branch/dev/artifacts) ------------------------------------ * (BugFix) - Fixed UI transparency issue +* (BugFix) - Fixed issues with games library sidebar text 'jumping' when changing the selected game ##### [0.5.18.1](https://medlaunch.info/releases/0-5-18-1) ###### 2017-09-25 diff --git a/appveyor.yml b/appveyor.yml index edde593..4310e4b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,4 +38,4 @@ deploy: prerelease: false force_update: true on: - branch: master, dev + branch: master From 185805f6fa33d8ef7f949a61d3cf944e6ef72d9d Mon Sep 17 00:00:00 2001 From: Asnivor Date: Fri, 29 Sep 2017 16:20:39 +0100 Subject: [PATCH 11/19] appveyor update --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4310e4b..2fac0e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,5 +37,3 @@ deploy: draft: true prerelease: false force_update: true - on: - branch: master From 4f056df5384f4fe53c5a5a1560f09691343d592c Mon Sep 17 00:00:00 2001 From: Asnivor Date: Tue, 3 Oct 2017 14:55:09 +0100 Subject: [PATCH 12/19] Some non-system mednafen key bindings can now be configured within medlaunch - #190 --- BuildTools/ChangeLog/default.md | 1 + .../Controls/VirtualDevices/MiscBindings.cs | 120 +++ MedLaunch/Classes/GameLauncher.cs | 28 + MedLaunch/MainWindow.xaml | 9 + MedLaunch/MainWindow.xaml.cs | 19 + MedLaunch/MedLaunch.csproj | 8 + MedLaunch/Properties/AssemblyInfo.cs | 4 +- MedLaunch/Windows/ConfigureMiscBindings.xaml | 270 +++++ .../Windows/ConfigureMiscBindings.xaml.cs | 967 ++++++++++++++++++ 9 files changed, 1424 insertions(+), 2 deletions(-) create mode 100644 MedLaunch/Classes/Controls/VirtualDevices/MiscBindings.cs create mode 100644 MedLaunch/Windows/ConfigureMiscBindings.xaml create mode 100644 MedLaunch/Windows/ConfigureMiscBindings.xaml.cs diff --git a/BuildTools/ChangeLog/default.md b/BuildTools/ChangeLog/default.md index 26c972d..a6b5dba 100644 --- a/BuildTools/ChangeLog/default.md +++ b/BuildTools/ChangeLog/default.md @@ -8,6 +8,7 @@ title: Changelog ------------------------------------ * (BugFix) - Fixed UI transparency issue * (BugFix) - Fixed issues with games library sidebar text 'jumping' when changing the selected game +* (Enhancement) - Some non-system related mednafen key bindings can now be set within MedLaunch ##### [0.5.18.1](https://medlaunch.info/releases/0-5-18-1) ###### 2017-09-25 diff --git a/MedLaunch/Classes/Controls/VirtualDevices/MiscBindings.cs b/MedLaunch/Classes/Controls/VirtualDevices/MiscBindings.cs new file mode 100644 index 0000000..147e4b5 --- /dev/null +++ b/MedLaunch/Classes/Controls/VirtualDevices/MiscBindings.cs @@ -0,0 +1,120 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MedLaunch.Classes.Controls.VirtualDevices +{ + public class MiscBindings + { + public static DeviceDefinition Misc(int VirtualPort) + { + DeviceDefinition device = new DeviceDefinition(); + device.DeviceName = "Misc Bindings"; + device.CommandStart = "command"; + device.VirtualPort = 0; + device.MapList = new List + { + new Mapping { Description = "Save state 0 select", MednafenCommand = "command.0" }, + new Mapping { Description = "Save state 1 select", MednafenCommand = "command.1" }, + new Mapping { Description = "Save state 2 select", MednafenCommand = "command.2" }, + new Mapping { Description = "Save state 3 select", MednafenCommand = "command.3" }, + new Mapping { Description = "Save state 4 select", MednafenCommand = "command.4" }, + new Mapping { Description = "Save state 5 select", MednafenCommand = "command.5" }, + new Mapping { Description = "Save state 6 select", MednafenCommand = "command.6" }, + new Mapping { Description = "Save state 7 select", MednafenCommand = "command.7" }, + new Mapping { Description = "Save state 8 select", MednafenCommand = "command.8" }, + new Mapping { Description = "Save state 9 select", MednafenCommand = "command.9" }, + new Mapping { Description = "Activate barcode(for Famicom)", MednafenCommand = "command.activate_barcode" }, + //new Mapping { Description = "Advance frame", MednafenCommand = "command.advance_frame" }, + /* + new Mapping { Description = "Select virtual device on virtual input port 1", MednafenCommand = "command.device_select1" }, + new Mapping { Description = "Select virtual device on virtual input port 2", MednafenCommand = "command.device_select2" }, + new Mapping { Description = "Select virtual device on virtual input port 3", MednafenCommand = "command.device_select3" }, + new Mapping { Description = "Select virtual device on virtual input port 4", MednafenCommand = "command.device_select4" }, + new Mapping { Description = "Select virtual device on virtual input port 5", MednafenCommand = "command.device_select5" }, + new Mapping { Description = "Select virtual device on virtual input port 6", MednafenCommand = "command.device_select6" }, + new Mapping { Description = "Select virtual device on virtual input port 7", MednafenCommand = "command.device_select7" }, + new Mapping { Description = "Select virtual device on virtual input port 8", MednafenCommand = "command.device_select8" }, + new Mapping { Description = "Select virtual device on virtual input port 9", MednafenCommand = "command.device_select9" }, + new Mapping { Description = "Select virtual device on virtual input port 10", MednafenCommand = "command.device_select10" }, + new Mapping { Description = "Select virtual device on virtual input port 11", MednafenCommand = "command.device_select11" }, + new Mapping { Description = "Select virtual device on virtual input port 12", MednafenCommand = "command.device_select12" }, + */ + new Mapping { Description = "Exit", MednafenCommand = "command.exit" }, + new Mapping { Description = "Fast-forward", MednafenCommand = "command.fast_forward" }, + /* + new Mapping { Description = "Configure buttons on virtual port 1", MednafenCommand = "command.input_config1" }, + new Mapping { Description = "Configure buttons on virtual port 2", MednafenCommand = "command.input_config2" }, + new Mapping { Description = "Configure buttons on virtual port 3", MednafenCommand = "command.input_config3" }, + new Mapping { Description = "Configure buttons on virtual port 4", MednafenCommand = "command.input_config4" }, + new Mapping { Description = "Configure buttons on virtual port 5", MednafenCommand = "command.input_config5" }, + new Mapping { Description = "Configure buttons on virtual port 6", MednafenCommand = "command.input_config6" }, + new Mapping { Description = "Configure buttons on virtual port 7", MednafenCommand = "command.input_config7" }, + new Mapping { Description = "Configure buttons on virtual port 8", MednafenCommand = "command.input_config8" }, + new Mapping { Description = "Configure buttons on virtual port 9", MednafenCommand = "command.input_config9" }, + new Mapping { Description = "Configure buttons on virtual port 10", MednafenCommand = "command.input_config10" }, + new Mapping { Description = "Configure buttons on virtual port 11", MednafenCommand = "command.input_config11" }, + new Mapping { Description = "Configure buttons on virtual port 11", MednafenCommand = "command.input_config12" }, + */ + new Mapping { Description = "Detect analog buttons on physical joysticks/gamepads(for use with the input configuration process)", MednafenCommand = "command.input_config_abd" }, + new Mapping { Description = "Configure command key", MednafenCommand = "command.input_configc" }, + //new Mapping { Description = "Configure command key, for all-pressed-to-trigger mode", MednafenCommand = "command.input_configc_am" }, + new Mapping { Description = "Insert coin", MednafenCommand = "command.insert_coin" }, + new Mapping { Description = "Insert/Eject disk/disc", MednafenCommand = "command.insert_eject_disk" }, + //new Mapping { Description = "Load movie", MednafenCommand = "command.load_movie" }, + new Mapping { Description = "Load state", MednafenCommand = "command.load_state" }, + /* + new Mapping { Description = "Movie 0 select", MednafenCommand = "command.m0" }, + new Mapping { Description = "Movie 1 select", MednafenCommand = "command.m1" }, + new Mapping { Description = "Movie 2 select", MednafenCommand = "command.m2" }, + new Mapping { Description = "Movie 3 select", MednafenCommand = "command.m3" }, + new Mapping { Description = "Movie 4 select", MednafenCommand = "command.m4" }, + new Mapping { Description = "Movie 5 select", MednafenCommand = "command.m5" }, + new Mapping { Description = "Movie 6 select", MednafenCommand = "command.m6" }, + new Mapping { Description = "Movie 7 select", MednafenCommand = "command.m7" }, + new Mapping { Description = "Movie 8 select", MednafenCommand = "command.m8" }, + new Mapping { Description = "Movie 9 select", MednafenCommand = "command.m9" }, + */ + new Mapping { Description = "Power toggle", MednafenCommand = "command.power" }, + new Mapping { Description = "Reset", MednafenCommand = "command.reset" }, + //new Mapping { Description = "Rotate screen", MednafenCommand = "command.rotate_screen" }, + //new Mapping { Description = "Return to normal mode after advancing frames", MednafenCommand = "command.run_normal" }, + //new Mapping { Description = "Save movie", MednafenCommand = "command.save_movie" }, + new Mapping { Description = "Save state", MednafenCommand = "command.save_state" }, + new Mapping { Description = "Select disk/disc", MednafenCommand = "command.select_disk" }, + new Mapping { Description = "Slow-forward", MednafenCommand = "command.slow_forward" }, + new Mapping { Description = "Rewind", MednafenCommand = "command.state_rewind" }, + new Mapping { Description = "Decrease selected save state slot by 1", MednafenCommand = "command.state_slot_dec" }, + new Mapping { Description = "Increase selected save state slot by 1", MednafenCommand = "command.state_slot_inc" }, + //new Mapping { Description = "Take scaled(and filtered) screen snapshot", MednafenCommand = "command.take_scaled_snapshot" }, + new Mapping { Description = "Take screen snapshot", MednafenCommand = "command.take_snapshot" }, + /* + new Mapping { Description = "Toggle graphics layer 1", MednafenCommand = "command.tl1" }, + new Mapping { Description = "Toggle graphics layer 2", MednafenCommand = "command.tl2" }, + new Mapping { Description = "Toggle graphics layer 3", MednafenCommand = "command.tl3" }, + new Mapping { Description = "Toggle graphics layer 4", MednafenCommand = "command.tl4" }, + new Mapping { Description = "Toggle graphics layer 5", MednafenCommand = "command.tl5" }, + new Mapping { Description = "Toggle graphics layer 6", MednafenCommand = "command.tl6" }, + new Mapping { Description = "Toggle graphics layer 7", MednafenCommand = "command.tl7" }, + new Mapping { Description = "Toggle graphics layer 8", MednafenCommand = "command.tl8" }, + new Mapping { Description = "Toggle graphics layer 9", MednafenCommand = "command.tl9" }, + */ + //new Mapping { Description = "Toggle debugger", MednafenCommand = "command.toggle_debugger" }, + new Mapping { Description = "Toggle DIP switch view", MednafenCommand = "command.toggle_dipview" }, + //new Mapping { Description = "Toggle frames-per-second display", MednafenCommand = "command.toggle_fps_view" }, + //new Mapping { Description = "Toggle fullscreen mode", MednafenCommand = "command.toggle_fs" }, + //new Mapping { Description = "Grab input", MednafenCommand = "command.toggle_grab" }, + new Mapping { Description = "Toggle help screen", MednafenCommand = "command.toggle_help" }, + //new Mapping { Description = "Toggle state rewind functionality", MednafenCommand = "command.toggle_state_rewind" }, + //new Mapping { Description = "Enable/Disable cheats", MednafenCommand = "command.togglecheatactive" }, + //new Mapping { Description = "Toggle cheat console", MednafenCommand = "command.togglecheatview" }, + new Mapping { Description = "Toggle netplay console", MednafenCommand = "command.togglenetview" }, + }; + + DeviceDefinition.PopulateConfig(device); + return device; + } + } +} diff --git a/MedLaunch/Classes/GameLauncher.cs b/MedLaunch/Classes/GameLauncher.cs index 153bab2..7aaab35 100644 --- a/MedLaunch/Classes/GameLauncher.cs +++ b/MedLaunch/Classes/GameLauncher.cs @@ -19,6 +19,7 @@ using WindowScrape.Types; using MedLaunch.Classes.Scanning; using MedLaunch.Common.IO.Compression; +using ucon64_wrapper; namespace MedLaunch.Classes { @@ -808,6 +809,33 @@ public string BuildFullGamePath(string GamesFolder, string GamePath) return path; } + public string ParseSMD(string inputFile, string outputDir) + { + if (!File.Exists(inputFile)) + return null; + + string ext = System.IO.Path.GetExtension(inputFile).ToLower(); + + // return original file if not an smd + if (ext.ToLower() != ".smd") + return inputFile; + + // test to see if file is interleaved + UconWrapper u = new UconWrapper(System.AppDomain.CurrentDomain.BaseDirectory + @"\ucon64-bin\ucon64.exe"); + u.OutputFolder = outputDir; + + var uResult = u.ScanGame(inputFile, SystemType.Genesis); + + if (uResult.Data.IsChecksumValid == true && uResult.Data.IsInterleaved.Value == true) + { + // we can process this smd and de-interleave it + u.ConvertSMDToBin(uResult); + return uResult.ConvertedPath; + } + + return inputFile; + } + private static string GetRomFolder(int systemId, MyDbContext db) { string romFolderPath; diff --git a/MedLaunch/MainWindow.xaml b/MedLaunch/MainWindow.xaml index 65e1c95..739aaca 100644 --- a/MedLaunch/MainWindow.xaml +++ b/MedLaunch/MainWindow.xaml @@ -10249,6 +10249,15 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro + + + + diff --git a/MedLaunch/MainWindow.xaml.cs b/MedLaunch/MainWindow.xaml.cs index 96e2f08..a9ae9be 100644 --- a/MedLaunch/MainWindow.xaml.cs +++ b/MedLaunch/MainWindow.xaml.cs @@ -5873,6 +5873,25 @@ private void btnControlRePoll_Click(object sender, RoutedEventArgs e) Input.Initialize(this); } + /// + /// Set non-system specific command bindings + /// + /// + /// + private async void btnControlCommandBindings_Click(object sender, RoutedEventArgs e) + { + // launch controller configuration window + await this.ShowChildWindowAsync(new ConfigureMiscBindings() + { + IsModal = true, + AllowMove = false, + Title = "Misc Binding Configuration", + CloseOnOverlay = false, + CloseByEscape = false, + ShowCloseButton = false + }, RootGrid); + } + /// /// Country filter buttons to the right of the games library dynamic search /// diff --git a/MedLaunch/MedLaunch.csproj b/MedLaunch/MedLaunch.csproj index 06e17cd..b1b60df 100644 --- a/MedLaunch/MedLaunch.csproj +++ b/MedLaunch/MedLaunch.csproj @@ -285,6 +285,7 @@ MSBuild:Compile Designer + @@ -392,6 +393,9 @@ + + ConfigureMiscBindings.xaml + ScraperGamePicker.xaml @@ -565,6 +569,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/MedLaunch/Properties/AssemblyInfo.cs b/MedLaunch/Properties/AssemblyInfo.cs index 305d660..442a48e 100644 --- a/MedLaunch/Properties/AssemblyInfo.cs +++ b/MedLaunch/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.5.18.3")] -[assembly: AssemblyFileVersion("0.5.18.3")] +[assembly: AssemblyVersion("0.5.18.4")] +[assembly: AssemblyFileVersion("0.5.18.4")] diff --git a/MedLaunch/Windows/ConfigureMiscBindings.xaml b/MedLaunch/Windows/ConfigureMiscBindings.xaml new file mode 100644 index 0000000..7e2f467 --- /dev/null +++ b/MedLaunch/Windows/ConfigureMiscBindings.xaml @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +