Commit Graph

302 Commits

Author SHA1 Message Date
Sappharad ee84e5981c Merge remote-tracking branch 'origin/1.x' into mono-portable
# Conflicts:
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
#	libmupen64plus/mupen64plus-win32-deps
#	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2019-10-03 21:33:28 -05:00
vadosnaprimer d41d068562 fix gpgx disasm 2019-04-03 22:23:11 +03:00
Sappharad 464bba9454 Merge branch 'master' into mono-portable
# Conflicts:
#	BizHawk.Client.EmuHawk/MainForm.Events.cs
#	BizHawk.Client.EmuHawk/Properties/Resources.resx
#	BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-06-04 19:31:56 -05:00
zeromus c96ff28055 fix broken GPGX trace logger disassembler (fixes #866) 2017-06-02 15:50:23 -05:00
Sappharad 5573409fad Merge branch 'master' into mono-portable
# Conflicts:
#	BizHawk.Client.Common/Extensions.cs
#	BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
#	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
#	BizHawk.Client.EmuHawk/MainForm.Events.cs
#	BizHawk.Client.EmuHawk/MainForm.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
#	BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs
#	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
#	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-05-23 20:32:48 -05:00
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -04:00
nattthebear 307d85cee0 The point of INPUT_KEYS is to document actual behavior, so lets fix it 2017-05-08 17:42:57 -04:00
adelikat b6fc3006e9 Cleanup SMS.IEmulator.cs 2017-05-08 11:42:22 -05:00
adelikat eafa39456f Genesis - there's a couple more buttons on the menacer 2017-05-07 18:05:09 -05:00
alyosha-tas 3769967fb0 Update MemoryMap.Korea.cs
Fix Xyzolog
2017-05-06 18:10:10 -04:00
adelikat 1dae91e6a8 clean up core constructors - consistent parameter casing, and put them at the top of the class 2017-05-05 19:05:36 -05:00
adelikat 59139ab266 Spell out Numerator and Denominator 2017-05-05 11:25:38 -05:00
adelikat 62a13d961d Move VsyncNum and VsyncDen out of CoreComm and into IVideoProvider 2017-05-05 11:21:37 -05:00
Sappharad 7f5aa0ae77 Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	BizHawk.Client.Common/PathManager.cs
	BizHawk.Client.Common/lua/LuaSandbox.cs
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs
	BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/GLManager.cs
	BizHawk.Client.EmuHawk/Program.cs
	BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs
	BizHawk.Client.EmuHawk/movie/PlayMovie.cs
	BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
	BizHawk.Emulation.Cores/LibretroOld/LibRetro.cs
	Version/VersionInfo.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-05-02 20:38:56 -05:00
adelikat 698c6741ae Refactor IEmulator and remove the IController property, instead pass it as a paramter to the FrameAdvance() method 2017-05-01 20:09:11 -05:00
adelikat b3ad3ce6ba Move BizInvoke files from Emulation.Common to Common 2017-05-01 17:30:42 -05:00
adelikat ffd743cac7 Remove Genesis.cs core 2017-05-01 16:27:40 -05:00
adelikat ded1c2d7b7 Break off BoardName from IEmulator into a separate IBoardInfo service 2017-04-30 21:01:54 -05:00
adelikat 17fe836926 Emulation.Common - misc cleanups in Base Implementations 2017-04-27 08:24:21 -05:00
adelikat 3192cc70ae slight refactor to IEmulator - make the IController property set only to more clearly express the client -> core relationship 2017-04-26 19:09:00 -05:00
adelikat 2de20e956b use Dictionary initializers instead of object initializers for various GetCpuFlagsAndRegisters() methods 2017-04-25 08:28:06 -05:00
adelikat 1ad6e7a95f oops 2017-04-24 13:56:42 -05:00
adelikat 1cb6289e13 Remove the obsolete MemoryDomain.FromIntPtrSwap16() method 2017-04-24 13:52:52 -05:00
adelikat 54ebe75d2b remove the obsolete MemoryDomain.FromIntPtr method 2017-04-24 13:47:40 -05:00
adelikat 44064d86d2 sms - nitpick code cleanup 2017-04-23 13:28:15 -05:00
J.D. Purcell b53502eed8 Spaces -> tabs. 2017-04-15 16:37:30 -04:00
J.D. Purcell ed3bf0e62b Fix mixed line endings. 2017-04-15 15:53:02 -04:00
nattthebear f8830652de Revert "GPGX remove an exception for debugging"
This reverts commit 96ac5d1122.
2017-04-15 08:09:08 -04:00
alyosha-tas 96ac5d1122 GPGX remove an exception for debugging
The core can handle this case just fine so there doesn't appear to be a need for it anyway
2017-04-14 21:44:15 -04:00
Sappharad d68d961ef8 Merge branch 'master' into mono-portable 2017-04-02 20:03:31 -05:00
adelikat f1cc6eab36 Fix a warning 2017-03-20 10:58:13 -05:00
Sappharad ecd9800968 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.DiscoHawk/DiscoHawk.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-03-14 20:36:35 -05:00
zeromus 22f9179ee7 fix #807 (GPGX double size option) 2017-02-25 02:57:04 -06:00
Sappharad df2a6c8154 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.cs
2017-02-21 20:02:00 -06:00
zeromus 4e2892d852 gpgx now width-doubles to match height-doubled hi-res video 2017-02-18 16:09:08 -06:00
Sappharad 25fd0fdb9a Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Client.EmuHawk/tools/GameShark.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-01-31 21:59:37 -06:00
adelikat ab1a22bf31 add TotalExecutedCycles as an IDebuggable property, and implement it in cores with the information readily available (and throw NotImplementedExecptions in the remaining). wire the property up to lua with emu.totalexecutedcycles(). Stil todo - wire it up to the Debugger gui 2017-01-09 19:23:05 -06:00
adelikat eda79c2212 Make an interface for CodeDataLog, and move CodeDataLog to Base Implementations 2016-12-16 11:33:02 -06:00
adelikat 691632f188 More IAsyncSoundProvider and related classes to BizHawk.Emulation.Cores and make them internal, since they are implementation details, and they are deprecrated and not intended to be used in future cores. 2016-12-16 08:50:05 -06:00
adelikat 72a59087b5 Use the IController indexing property less in preparation for removing it from the interface. Replaced with its more explicity counter-part .IsPressed() 2016-12-14 12:42:15 -06:00
adelikat aaed8e67d5 NullController - remove a bunch of methods that were originally part of IController but no longer are, and clean up the code a bit 2016-12-14 09:16:54 -06:00
Sappharad e0d2a88f07 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
	BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2016-12-12 20:29:18 -06:00
adelikat b465eaa470 Remove two sound refactor todo comments 2016-12-11 12:27:11 -06:00
adelikat b73a500d6b Major sound provider refactor. Create a unified interface ISoundProvider, that is an IEmulator service and break it off of IEmulator. IAsyncSoundProvider was kept as a shim for now, for legacy cores that were inherintly async. 2016-12-11 11:15:00 -06:00
adelikat b697110098 Rename ISoundProvider to IAsyncSoundProvider to more accurately describe what the service does 2016-12-09 10:24:43 -06:00
Sappharad c6eb2dbb47 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.Events.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2016-12-05 21:47:31 -06:00
alyosha-tas b2920834b1 Fix Shining Force games ( #600 and #335 )
Fixes SRAM selection and Interrupt control
2016-11-03 20:49:19 -04:00
Sappharad cb8382a151 Merge branch 'master' into mono-portable 2016-09-01 20:45:39 -05:00
feos af78aedc02 as always 2016-08-24 07:26:42 +03:00
Sappharad 49b7ff4cc2 Revert "yabause tracer"
This reverts commit 6e0b8e2784.
2016-08-23 21:31:42 -05:00