From b39c2dccf056882e112dfdfe9e9d772a767a42c0 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 6 Jun 2017 11:07:16 -0500 Subject: [PATCH] NGP - mnemonic for Option button, Virtualpad support --- .../movie/bk2/Bk2MnemonicConstants.cs | 4 + .../BizHawk.Client.EmuHawk.csproj | 4381 +++++++++-------- .../tools/VirtualPads/schema/NgpSchema.cs | 102 + 3 files changed, 2297 insertions(+), 2190 deletions(-) create mode 100644 BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs diff --git a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs index f1b7e5b7ee..526a75c04a 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs @@ -293,6 +293,10 @@ namespace BizHawk.Client.Common ["Option 1"] = '1', ["Option 2"] = '2' }, + ["NGP"] = new Dictionary + { + ["Option"] = 'O' + }, ["AppleII"] = new Dictionary { ["Tab"] = 't' , diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index cb09b32ae3..83ef4f6b5b 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1,2197 +1,2198 @@ - - - - Debug - x86 - 9.0.30729 - 2.0 - {DD448B37-BA3F-4544-9754-5406E8094723} - WinExe - Properties - BizHawk.Client.EmuHawk - EmuHawk - v4.6.1 - 512 - BizHawk.Client.EmuHawk.Program - false - images\logo.ico - - - 3.5 - - - WINDOWS - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - true - full - false - ..\output\ - $(DefineConstants);DEBUG - prompt - 4 - x86 - false - true - AllRules.ruleset - false - - - pdbonly - true - ..\output\ - prompt - 4 - x86 - true - false - AllRules.ruleset - WINDOWS - false - - - true - - - true - ..\output64\ - WINDOWS;DEBUG - true - full - x64 - ..\output\EmuHawk.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - false - prompt - AllRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - false - - - ..\output64\ - WINDOWS - true - true - pdbonly - x64 - ..\output\EmuHawk.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - false - prompt - AllRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - false - - - - ..\References\GongShell.dll - - - ..\References\ICSharpCode.SharpZipLib.dll - - - False - ..\References\$(Platform)\LuaInterface.dll - - - - - ..\References\Newtonsoft.Json.dll - - - False - ..\References\OpenTK.dll - - - False - ..\References\$(Platform)\SlimDX.dll - - - - 3.5 - - - - - - 3.5 - - - 3.5 - - - - - - - - - - - svnrev.cs - - - VersionInfo.cs - - - Form - - - AboutBox.cs - - - Form - - - ArchiveChooser.cs - - - - - - - Form - - - FFmpegWriterForm.cs - - - - Form - - - GifWriterForm.cs - - - - Form - - - JMDForm.cs - - - - Component - - - - - - Code - - - Code - - - Code - - - - Form - - - SynclessRecordingTools.cs - - - Form - - - VideoWriterChooserForm.cs - - - - Form - - - BizBox.cs - - - UserControl - - - BizBoxInfoControl.cs - - - Component - - - AnalogRangeConfig.cs - - - UserControl - - - AnalogRangeConfigControl.cs - - - Form - - - AutofireConfig.cs - - - Form - - - ControllerConfig.cs - - - UserControl - - - AnalogBindControl.cs - - - UserControl - - - UserControl - - - ControllerConfigPanel.cs - - - Form - - - DisplayConfigLite.cs - - - Form - - - FileExtensionPreferences.cs - - - UserControl - - - FileExtensionPreferencesPicker.cs - - - Form - - - FirmwaresConfig.cs - - - Form - - - FirmwaresConfigInfo.cs - - - Form - - - DisplayConfig.cs - - - Component - - - Form - - - CGBColorChooserForm.cs - - - Form - - - ColorChooserForm.cs - - - Form - - - DGBPrefs.cs - - - UserControl - - - GBPrefControl.cs - - - Form - - - GBPrefs.cs - - - Form - - - GenericCoreConfig.cs - - - Form - - - GuiOptions.cs - - - Form - - - HotkeyConfig.cs - - - UserControl - - - InputCompositeWidget.cs - - - Component - - - Form - - - ColecoControllerSettings.cs - - - Form - - - IntvControllerSettings.cs - - - Form - - - MessageConfig.cs - - - UserControl - - - N64ControllerSettingControl.cs - - - Form - - - N64ControllersSetup.cs - - - Form - - - N64VideoPluginconfig.cs - - - Form - - - NewN64PluginSettings.cs - - - - Form - - - NesControllerSettings.cs - - - Form - - - NESGraphicsConfig.cs - - - Form - - - NESSoundConfig.cs - - - Form - - - NESSyncSettingsForm.cs - - - Form - - - NESVSSettings.cs - - - Form - - - QuickNesConfig.cs - - - Form - - - PathConfig.cs - - - Form - - - PathInfo.cs - - - Form - - - PCEControllerConfig.cs - - - Form - - - PCEGraphicsConfig.cs - - - Form - - - ProfileConfig.cs - - - Form - - - PSXControllerConfigNew.cs - - - Form - - - PSXHashDiscs.cs - - - Form - - - PSXOptions.cs - - - Form - - - RewindConfig.cs - - - Form - - - SMSGraphicsConfig.cs - - - Form - - - SNESControllerConfig.cs - - - Form - - - SNESOptions.cs - - - Form - - - SoundConfig.cs - - - Form - - - TI83PaletteConfig.cs - - - Form - - - CoreFeatureAnalysis.cs - - - Form - - - ExceptionBox.cs - - - Component - - - - Component - - - Component - - - Form - - - Component - - - InputRoll.cs - Component - - - Component - - - Component - - - Form - - - MsgBox.cs - - - Form - - - PrereqsAlert.cs - - - Form - - - QuickProgressPopup.cs - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - - - - - - - - - - - - - - - - - Form - - - - - - - - - - - - Form - - - LogWindow.cs - - - MainForm.cs - Form - - - MainForm.cs - Form - - - Form - - - EditCommentsForm.cs - - - - Form - - - MainForm.cs - - - MainForm.cs - Form - - - Form - - - EditSubtitlesForm.cs - - - - Form - - - PlayMovie.cs - - - Form - - - RecordMovie.cs - - - Form - - - SubtitleMaker.cs - - - Form - - - NameStateForm.cs - - - - Form - - - OpenAdvancedChooser.cs - - - Form - - - PlatformChooser.cs - - - - - - True - True - Resources.resx - - - Form - - - RomStatusPicker.cs - - - - - - - - - - - - - - - Form - - - AutoHawk.cs - - - Form - - - BasicBot.cs - - - UserControl - - - BotControlsRow.cs - - - Form - - - BatchRun.cs - - - - Form - - - CDL.cs - - - UserControl - - - CheatEdit.cs - - - Form - - - Cheats.cs - - - Form - - - AddBreakpointDialog.cs - - - - UserControl - - - BreakpointControl.cs - - - Form - - - GenericDebugger.cs - - - GenericDebugger.cs - Form - - - GenericDebugger.cs - Form - - - GenericDebugger.cs - Form - - - UserControl - - - RegisterBoxControl.cs - - - Form - - - GameShark.cs - - - Form - - - GBAGPUView.cs - - - Form - - - MobileBmpView.cs - - - Form - - - MobileDetailView.cs - - - Form - - - GBGameGenie.cs - - - Form - - - GBGPUView.cs - - - Form - - - GenDbgWind.cs - - - Form - - - GenGameGenie.cs - - - Form - - - VDPViewer.cs - - - Form - - - HexColor.cs - - - Form - - - HexEditor.cs - - - Form - - - HexFind.cs - - - Form - - - NewHexEditor.cs - - - - - - - - - - - - Form - - - LuaCanvas.cs - - - Component - - - Component - - - Form - - - LuaConsole.cs - - - Component - - - Form - - - LuaFunctionsForm.cs - - - Form - - - LuaRegisteredFunctionsList.cs - - - Component - - - Form - - - LuaWinform.cs - - - Component - - - Form - - - Form - - - MacroInput.cs - - - - UserControl - - - MultiDiskFileSelector.cs - - - Form - - - MultiDiskBundler.cs - - - Form - - - BarcodeEntry.cs - - - Component - - - Form - - - NESGameGenie.cs - - - Form - - - NESMusicRipper.cs - - - Form - - - NESNameTableViewer.cs - - - Form - - - NESPPU.cs - - - Component - - - Component - - - Component - - - Component - - - Form - - - PCEBGViewer.cs - - - Form - - - PCESoundDebugger.cs - - - Form - - - PCETileViewer.cs - - - Form - - - VDPViewer.cs - - - Form - - - SNESGameGenie.cs - - - Form - - - SNESGraphicsDebugger.cs - - - Component - - - UserControl - - - BookmarksBranchesBox.cs - - - Form - - - DefaultGreenzoneSettings.cs - - - Form - - - FramesPrompt.cs - - - Form - - - GreenzoneSettings.cs - - - Form - - - HeaderEditor.cs - - - Form - - - PatternsForm.cs - - - Form - - - ScreenshotForm.cs - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - UserControl - - - MarkerControl.cs - - - UserControl - - - PlaybackBox.cs - - - Form - - - TAStudio.cs - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - - Form - - - UndoHistoryForm.cs - - - Form - - - TI83KeyPad.cs - - - Form - - - - Form - - - TraceLogger.cs - - - Component - - - - UserControl - - - VirtualPadAnalogButton.cs - - - UserControl - - - VirtualPadAnalogStick.cs - - - Component - - - UserControl - - - VirtualPadDiscManager.cs - - - UserControl - - - VirtualPadTargetScreen.cs - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - VirtualPad.cs - - - Form - - - VirtualpadsTool.cs - - - Form - - - RamPoke.cs - - - Form - - - RamSearch.cs - - - Form - - - RamWatch.cs - - - Form - - - WatchEditor.cs - - - Component - - - - Code - - - FFmpegWriterForm.cs - - - GifWriterForm.cs - - - JMDForm.cs - - - SynclessRecordingTools.cs - - - VideoWriterChooserForm.cs - - - BizBoxInfoControl.cs - - - AnalogRangeConfigControl.cs - - - ControllerConfig.cs - - - AnalogBindControl.cs - - - ControllerConfigPanel.cs - - - DisplayConfig.cs - - - DisplayConfigLite.cs - Designer - - - FileExtensionPreferences.cs - - - FileExtensionPreferencesPicker.cs - - - FirmwaresConfig.cs - - - FirmwaresConfigInfo.cs - - - CGBColorChooserForm.cs - - - ColorChooserForm.cs - - - DGBPrefs.cs - - - GBPrefControl.cs - - - GBPrefs.cs - - - GenericCoreConfig.cs - - - GuiOptions.cs - - - HotkeyConfig.cs - - - InputCompositeWidget.cs - - - ColecoControllerSettings.cs - - - IntvControllerSettings.cs - - - N64ControllerSettingControl.cs - - - N64ControllersSetup.cs - - - N64VideoPluginconfig.cs - - - NewN64PluginSettings.cs - - - NesControllerSettings.cs - - - NESGraphicsConfig.cs - - - NESSoundConfig.cs - - - NESSyncSettingsForm.cs - - - NESVSSettings.cs - - - QuickNesConfig.cs - - - PathConfig.cs - - - PathInfo.cs - - - PCEControllerConfig.cs - - - PCEGraphicsConfig.cs - - - ProfileConfig.cs - - - PSXControllerConfigNew.cs - - - PSXHashDiscs.cs - - - PSXOptions.cs - - - RewindConfig.cs - - - SMSGraphicsConfig.cs - - - SNESControllerConfig.cs - - - SNESOptions.cs - - - TI83PaletteConfig.cs - - - CoreFeatureAnalysis.cs - - - ExceptionBox.cs - - - InputConfigBase.cs - - - MsgBox.cs - - - PrereqsAlert.cs - - - QuickProgressPopup.cs - - - TasListView.cs - - - MainForm.cs - Designer - - - PlayMovie.cs - - - RecordMovie.cs - - - NameStateForm.cs - Designer - - - OpenAdvancedChooser.cs - - - PlatformChooser.cs - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - RomStatusPicker.cs - - - AutoHawk.cs - - - BasicBot.cs - - - BotControlsRow.cs - - - BatchRun.cs - - - CDL.cs - - - CheatEdit.cs - - - Cheats.cs - - - AddBreakpointDialog.cs - - - BreakpointControl.cs - - - GenericDebugger.cs - - - RegisterBoxControl.cs - - - GameShark.cs - Designer - - - GBAGPUView.cs - - - MobileBmpView.cs - - - MobileDetailView.cs - - - GBGameGenie.cs - - - GBGPUView.cs - - - GenDbgWind.cs - - - GenGameGenie.cs - - - VDPViewer.cs - - - HexColor.cs - - - HexEditor.cs - - - HexFind.cs - - - NewHexEditor.cs - - - LuaCanvas.cs - - - LuaConsole.cs - - - LuaFunctionsForm.cs - - - LuaRegisteredFunctionsList.cs - - - LuaWinform.cs - - - MacroInput.cs - - - MultiDiskFileSelector.cs - - - MultiDiskBundler.cs - - - BarcodeEntry.cs - - - NESGameGenie.cs - - - NESMusicRipper.cs - - - NESNameTableViewer.cs - - - NESPPU.cs - Designer - - - PatternViewer.cs - - - PCEBGViewer.cs - - - PCESoundDebugger.cs - - - PCETileViewer.cs - - - VDPViewer.cs - - - SNESGameGenie.cs - - - SNESGraphicsDebugger.cs - - - BookmarksBranchesBox.cs - Designer - - - DefaultGreenzoneSettings.cs - - - FramesPrompt.cs - - - GreenzoneSettings.cs - - - HeaderEditor.cs - - - MarkerControl.cs - - - PatternsForm.cs - - - PlaybackBox.cs - - - ScreenshotForm.cs - - - TAStudio.cs - - - UndoHistoryForm.cs - - - TI83KeyPad.cs - - - VirtualPadAnalogButton.cs - - - VirtualPadAnalogStick.cs - - - VirtualPadDiscManager.cs - - - VirtualPadTargetScreen.cs - - - VirtualPad.cs - - - VirtualpadsTool.cs - - - RamPoke.cs - - - RamSearch.cs - - - RamWatch.cs - - - WatchEditor.cs - - - Form - - - InputPrompt.cs - - - - Form - - - ToolBox.cs - - - - - - {8e2f11f2-3955-4382-8c3a-ceba1276caea} - BizHawk.Client.ApiHawk - - - {24A0AA3C-B25F-4197-B23D-476D6462DBA0} - BizHawk.Client.Common - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} - BizHawk.Emulation.Cores - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - {337CA23E-65E7-44E1-9411-97EE08BB8116} - BizHawk.Bizware.BizwareGL.GdiPlus - - - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE} - BizHawk.Bizware.BizwareGL.OpenTK - - - {E6B436B1-A3CD-4C9A-8F76-5D7154726884} - BizHawk.Bizware.BizwareGL.SlimDX - - - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} - BizHawk.Bizware.BizwareGL - - - - - AboutBox.cs - Designer - - - ArchiveChooser.cs - Designer - - - BizBox.cs - - - AutofireConfig.cs - - - MessageConfig.cs - Designer - - - SoundConfig.cs - Designer - - - - - - - - LogWindow.cs - - - EditCommentsForm.cs - - - EditSubtitlesForm.cs - - - SubtitleMaker.cs - - - TraceLogger.cs - - - InputPrompt.cs - Designer - - - ToolBox.cs - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - false - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - + + + + Debug + x86 + 9.0.30729 + 2.0 + {DD448B37-BA3F-4544-9754-5406E8094723} + WinExe + Properties + BizHawk.Client.EmuHawk + EmuHawk + v4.6.1 + 512 + BizHawk.Client.EmuHawk.Program + false + images\logo.ico + + + 3.5 + + + WINDOWS + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + true + full + false + ..\output\ + $(DefineConstants);DEBUG + prompt + 4 + x86 + false + true + AllRules.ruleset + false + + + pdbonly + true + ..\output\ + prompt + 4 + x86 + true + false + AllRules.ruleset + WINDOWS + false + + + true + + + true + ..\output64\ + WINDOWS;DEBUG + true + full + x64 + ..\output\EmuHawk.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + false + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + true + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + true + false + false + + + ..\output64\ + WINDOWS + true + true + pdbonly + x64 + ..\output\EmuHawk.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + false + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + true + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + true + false + false + + + + ..\References\GongShell.dll + + + ..\References\ICSharpCode.SharpZipLib.dll + + + False + ..\References\$(Platform)\LuaInterface.dll + + + + + ..\References\Newtonsoft.Json.dll + + + False + ..\References\OpenTK.dll + + + False + ..\References\$(Platform)\SlimDX.dll + + + + 3.5 + + + + + + 3.5 + + + 3.5 + + + + + + + + + + + svnrev.cs + + + VersionInfo.cs + + + Form + + + AboutBox.cs + + + Form + + + ArchiveChooser.cs + + + + + + + Form + + + FFmpegWriterForm.cs + + + + Form + + + GifWriterForm.cs + + + + Form + + + JMDForm.cs + + + + Component + + + + + + Code + + + Code + + + Code + + + + Form + + + SynclessRecordingTools.cs + + + Form + + + VideoWriterChooserForm.cs + + + + Form + + + BizBox.cs + + + UserControl + + + BizBoxInfoControl.cs + + + Component + + + AnalogRangeConfig.cs + + + UserControl + + + AnalogRangeConfigControl.cs + + + Form + + + AutofireConfig.cs + + + Form + + + ControllerConfig.cs + + + UserControl + + + AnalogBindControl.cs + + + UserControl + + + UserControl + + + ControllerConfigPanel.cs + + + Form + + + DisplayConfigLite.cs + + + Form + + + FileExtensionPreferences.cs + + + UserControl + + + FileExtensionPreferencesPicker.cs + + + Form + + + FirmwaresConfig.cs + + + Form + + + FirmwaresConfigInfo.cs + + + Form + + + DisplayConfig.cs + + + Component + + + Form + + + CGBColorChooserForm.cs + + + Form + + + ColorChooserForm.cs + + + Form + + + DGBPrefs.cs + + + UserControl + + + GBPrefControl.cs + + + Form + + + GBPrefs.cs + + + Form + + + GenericCoreConfig.cs + + + Form + + + GuiOptions.cs + + + Form + + + HotkeyConfig.cs + + + UserControl + + + InputCompositeWidget.cs + + + Component + + + Form + + + ColecoControllerSettings.cs + + + Form + + + IntvControllerSettings.cs + + + Form + + + MessageConfig.cs + + + UserControl + + + N64ControllerSettingControl.cs + + + Form + + + N64ControllersSetup.cs + + + Form + + + N64VideoPluginconfig.cs + + + Form + + + NewN64PluginSettings.cs + + + + Form + + + NesControllerSettings.cs + + + Form + + + NESGraphicsConfig.cs + + + Form + + + NESSoundConfig.cs + + + Form + + + NESSyncSettingsForm.cs + + + Form + + + NESVSSettings.cs + + + Form + + + QuickNesConfig.cs + + + Form + + + PathConfig.cs + + + Form + + + PathInfo.cs + + + Form + + + PCEControllerConfig.cs + + + Form + + + PCEGraphicsConfig.cs + + + Form + + + ProfileConfig.cs + + + Form + + + PSXControllerConfigNew.cs + + + Form + + + PSXHashDiscs.cs + + + Form + + + PSXOptions.cs + + + Form + + + RewindConfig.cs + + + Form + + + SMSGraphicsConfig.cs + + + Form + + + SNESControllerConfig.cs + + + Form + + + SNESOptions.cs + + + Form + + + SoundConfig.cs + + + Form + + + TI83PaletteConfig.cs + + + Form + + + CoreFeatureAnalysis.cs + + + Form + + + ExceptionBox.cs + + + Component + + + + Component + + + Component + + + Form + + + Component + + + InputRoll.cs + Component + + + Component + + + Component + + + Form + + + MsgBox.cs + + + Form + + + PrereqsAlert.cs + + + Form + + + QuickProgressPopup.cs + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + + + + + + + + + + + + + + + + + Form + + + + + + + + + + + + Form + + + LogWindow.cs + + + MainForm.cs + Form + + + MainForm.cs + Form + + + Form + + + EditCommentsForm.cs + + + + Form + + + MainForm.cs + + + MainForm.cs + Form + + + Form + + + EditSubtitlesForm.cs + + + + Form + + + PlayMovie.cs + + + Form + + + RecordMovie.cs + + + Form + + + SubtitleMaker.cs + + + Form + + + NameStateForm.cs + + + + Form + + + OpenAdvancedChooser.cs + + + Form + + + PlatformChooser.cs + + + + + + True + True + Resources.resx + + + Form + + + RomStatusPicker.cs + + + + + + + + + + + + + + + Form + + + AutoHawk.cs + + + Form + + + BasicBot.cs + + + UserControl + + + BotControlsRow.cs + + + Form + + + BatchRun.cs + + + + Form + + + CDL.cs + + + UserControl + + + CheatEdit.cs + + + Form + + + Cheats.cs + + + Form + + + AddBreakpointDialog.cs + + + + UserControl + + + BreakpointControl.cs + + + Form + + + GenericDebugger.cs + + + GenericDebugger.cs + Form + + + GenericDebugger.cs + Form + + + GenericDebugger.cs + Form + + + UserControl + + + RegisterBoxControl.cs + + + Form + + + GameShark.cs + + + Form + + + GBAGPUView.cs + + + Form + + + MobileBmpView.cs + + + Form + + + MobileDetailView.cs + + + Form + + + GBGameGenie.cs + + + Form + + + GBGPUView.cs + + + Form + + + GenDbgWind.cs + + + Form + + + GenGameGenie.cs + + + Form + + + VDPViewer.cs + + + Form + + + HexColor.cs + + + Form + + + HexEditor.cs + + + Form + + + HexFind.cs + + + Form + + + NewHexEditor.cs + + + + + + + + + + + + Form + + + LuaCanvas.cs + + + Component + + + Component + + + Form + + + LuaConsole.cs + + + Component + + + Form + + + LuaFunctionsForm.cs + + + Form + + + LuaRegisteredFunctionsList.cs + + + Component + + + Form + + + LuaWinform.cs + + + Component + + + Form + + + Form + + + MacroInput.cs + + + + UserControl + + + MultiDiskFileSelector.cs + + + Form + + + MultiDiskBundler.cs + + + Form + + + BarcodeEntry.cs + + + Component + + + Form + + + NESGameGenie.cs + + + Form + + + NESMusicRipper.cs + + + Form + + + NESNameTableViewer.cs + + + Form + + + NESPPU.cs + + + Component + + + Component + + + Component + + + Component + + + Form + + + PCEBGViewer.cs + + + Form + + + PCESoundDebugger.cs + + + Form + + + PCETileViewer.cs + + + Form + + + VDPViewer.cs + + + Form + + + SNESGameGenie.cs + + + Form + + + SNESGraphicsDebugger.cs + + + Component + + + UserControl + + + BookmarksBranchesBox.cs + + + Form + + + DefaultGreenzoneSettings.cs + + + Form + + + FramesPrompt.cs + + + Form + + + GreenzoneSettings.cs + + + Form + + + HeaderEditor.cs + + + Form + + + PatternsForm.cs + + + Form + + + ScreenshotForm.cs + + + TAStudio.cs + Form + + + TAStudio.cs + Form + + + TAStudio.cs + Form + + + UserControl + + + MarkerControl.cs + + + UserControl + + + PlaybackBox.cs + + + Form + + + TAStudio.cs + + + TAStudio.cs + Form + + + TAStudio.cs + Form + + + TAStudio.cs + Form + + + + Form + + + UndoHistoryForm.cs + + + Form + + + TI83KeyPad.cs + + + Form + + + + Form + + + TraceLogger.cs + + + Component + + + + UserControl + + + VirtualPadAnalogButton.cs + + + UserControl + + + VirtualPadAnalogStick.cs + + + Component + + + UserControl + + + VirtualPadDiscManager.cs + + + UserControl + + + VirtualPadTargetScreen.cs + + + + + + + + + + + + + + + + + + + + + + + + + + UserControl + + + VirtualPad.cs + + + Form + + + VirtualpadsTool.cs + + + Form + + + RamPoke.cs + + + Form + + + RamSearch.cs + + + Form + + + RamWatch.cs + + + Form + + + WatchEditor.cs + + + Component + + + + Code + + + FFmpegWriterForm.cs + + + GifWriterForm.cs + + + JMDForm.cs + + + SynclessRecordingTools.cs + + + VideoWriterChooserForm.cs + + + BizBoxInfoControl.cs + + + AnalogRangeConfigControl.cs + + + ControllerConfig.cs + + + AnalogBindControl.cs + + + ControllerConfigPanel.cs + + + DisplayConfig.cs + + + DisplayConfigLite.cs + Designer + + + FileExtensionPreferences.cs + + + FileExtensionPreferencesPicker.cs + + + FirmwaresConfig.cs + + + FirmwaresConfigInfo.cs + + + CGBColorChooserForm.cs + + + ColorChooserForm.cs + + + DGBPrefs.cs + + + GBPrefControl.cs + + + GBPrefs.cs + + + GenericCoreConfig.cs + + + GuiOptions.cs + + + HotkeyConfig.cs + + + InputCompositeWidget.cs + + + ColecoControllerSettings.cs + + + IntvControllerSettings.cs + + + N64ControllerSettingControl.cs + + + N64ControllersSetup.cs + + + N64VideoPluginconfig.cs + + + NewN64PluginSettings.cs + + + NesControllerSettings.cs + + + NESGraphicsConfig.cs + + + NESSoundConfig.cs + + + NESSyncSettingsForm.cs + + + NESVSSettings.cs + + + QuickNesConfig.cs + + + PathConfig.cs + + + PathInfo.cs + + + PCEControllerConfig.cs + + + PCEGraphicsConfig.cs + + + ProfileConfig.cs + + + PSXControllerConfigNew.cs + + + PSXHashDiscs.cs + + + PSXOptions.cs + + + RewindConfig.cs + + + SMSGraphicsConfig.cs + + + SNESControllerConfig.cs + + + SNESOptions.cs + + + TI83PaletteConfig.cs + + + CoreFeatureAnalysis.cs + + + ExceptionBox.cs + + + InputConfigBase.cs + + + MsgBox.cs + + + PrereqsAlert.cs + + + QuickProgressPopup.cs + + + TasListView.cs + + + MainForm.cs + Designer + + + PlayMovie.cs + + + RecordMovie.cs + + + NameStateForm.cs + Designer + + + OpenAdvancedChooser.cs + + + PlatformChooser.cs + + + ResXFileCodeGenerator + Designer + Resources.Designer.cs + + + RomStatusPicker.cs + + + AutoHawk.cs + + + BasicBot.cs + + + BotControlsRow.cs + + + BatchRun.cs + + + CDL.cs + + + CheatEdit.cs + + + Cheats.cs + + + AddBreakpointDialog.cs + + + BreakpointControl.cs + + + GenericDebugger.cs + + + RegisterBoxControl.cs + + + GameShark.cs + Designer + + + GBAGPUView.cs + + + MobileBmpView.cs + + + MobileDetailView.cs + + + GBGameGenie.cs + + + GBGPUView.cs + + + GenDbgWind.cs + + + GenGameGenie.cs + + + VDPViewer.cs + + + HexColor.cs + + + HexEditor.cs + + + HexFind.cs + + + NewHexEditor.cs + + + LuaCanvas.cs + + + LuaConsole.cs + + + LuaFunctionsForm.cs + + + LuaRegisteredFunctionsList.cs + + + LuaWinform.cs + + + MacroInput.cs + + + MultiDiskFileSelector.cs + + + MultiDiskBundler.cs + + + BarcodeEntry.cs + + + NESGameGenie.cs + + + NESMusicRipper.cs + + + NESNameTableViewer.cs + + + NESPPU.cs + Designer + + + PatternViewer.cs + + + PCEBGViewer.cs + + + PCESoundDebugger.cs + + + PCETileViewer.cs + + + VDPViewer.cs + + + SNESGameGenie.cs + + + SNESGraphicsDebugger.cs + + + BookmarksBranchesBox.cs + Designer + + + DefaultGreenzoneSettings.cs + + + FramesPrompt.cs + + + GreenzoneSettings.cs + + + HeaderEditor.cs + + + MarkerControl.cs + + + PatternsForm.cs + + + PlaybackBox.cs + + + ScreenshotForm.cs + + + TAStudio.cs + + + UndoHistoryForm.cs + + + TI83KeyPad.cs + + + VirtualPadAnalogButton.cs + + + VirtualPadAnalogStick.cs + + + VirtualPadDiscManager.cs + + + VirtualPadTargetScreen.cs + + + VirtualPad.cs + + + VirtualpadsTool.cs + + + RamPoke.cs + + + RamSearch.cs + + + RamWatch.cs + + + WatchEditor.cs + + + Form + + + InputPrompt.cs + + + + Form + + + ToolBox.cs + + + + + + {8e2f11f2-3955-4382-8c3a-ceba1276caea} + BizHawk.Client.ApiHawk + + + {24A0AA3C-B25F-4197-B23D-476D6462DBA0} + BizHawk.Client.Common + + + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} + BizHawk.Common + + + {e1a23168-b571-411c-b360-2229e7225e0e} + BizHawk.Emulation.Common + + + {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} + BizHawk.Emulation.Cores + + + {f51946ea-827f-4d82-b841-1f2f6d060312} + BizHawk.Emulation.DiscSystem + + + {337CA23E-65E7-44E1-9411-97EE08BB8116} + BizHawk.Bizware.BizwareGL.GdiPlus + + + {5160CFB1-5389-47C1-B7F6-8A0DC97641EE} + BizHawk.Bizware.BizwareGL.OpenTK + + + {E6B436B1-A3CD-4C9A-8F76-5D7154726884} + BizHawk.Bizware.BizwareGL.SlimDX + + + {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} + BizHawk.Bizware.BizwareGL + + + + + AboutBox.cs + Designer + + + ArchiveChooser.cs + Designer + + + BizBox.cs + + + AutofireConfig.cs + + + MessageConfig.cs + Designer + + + SoundConfig.cs + Designer + + + + + + + + LogWindow.cs + + + EditCommentsForm.cs + + + EditSubtitlesForm.cs + + + SubtitleMaker.cs + + + TraceLogger.cs + + + InputPrompt.cs + Designer + + + ToolBox.cs + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 2.0 %28x86%29 + false + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + - - ..\Build\BizHawk.Build.Tool.exe LARGEADDRESS --value 1 --target "$(TargetPath)" - - - "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" - "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" - - - - - + --> + + ..\Build\BizHawk.Build.Tool.exe LARGEADDRESS --value 1 --target "$(TargetPath)" + + + "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" + "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" + + + + + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs new file mode 100644 index 0000000000..667ef6a28c --- /dev/null +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs @@ -0,0 +1,102 @@ +using System.Collections.Generic; +using System.Drawing; + +using BizHawk.Emulation.Common; + +namespace BizHawk.Client.EmuHawk +{ + [SchemaAttributes("NGP")] + public class NgpSchema : IVirtualPadSchema + { + public IEnumerable GetPadSchemas(IEmulator core) + { + yield return StandardController(); + yield return ConsoleButtons(); + } + + private static PadSchema StandardController() + { + return new PadSchema + { + IsConsole = false, + DefaultSize = new Size(174, 79), + Buttons = new[] + { + new PadSchema.ButtonSchema + { + Name = "Up", + DisplayName = "", + Icon = Properties.Resources.BlueUp, + Location = new Point(14, 12), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonSchema + { + Name = "Down", + DisplayName = "", + Icon = Properties.Resources.BlueDown, + Location = new Point(14, 56), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonSchema + { + Name = "Left", + DisplayName = "", + Icon = Properties.Resources.Back, + Location = new Point(2, 34), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonSchema + { + Name = "Right", + DisplayName = "", + Icon = Properties.Resources.Forward, + Location = new Point(24, 34), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonSchema + { + Name = "B", + DisplayName = "B", + Location = new Point(74, 34), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonSchema + { + Name = "A", + DisplayName = "A", + Location = new Point(98, 34), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonSchema + { + Name = "Option", + DisplayName = "O", + Location = new Point(146, 12), + Type = PadSchema.PadInputType.Boolean + } + } + }; + } + + private static PadSchema ConsoleButtons() + { + return new PadSchema + { + DisplayName = "Console", + IsConsole = true, + DefaultSize = new Size(75, 50), + Buttons = new[] + { + new PadSchema.ButtonSchema + { + Name = "Power", + DisplayName = "Power", + Location = new Point(10, 15), + Type = PadSchema.PadInputType.Boolean + } + } + }; + } + } +}