Commit Graph

193 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
feos d8280551bb and default to gliden again, since it's been fixed for xp
also more jabo option backwards
2018-06-09 02:03:12 +03:00
feos daa4e18372 n64 default to glide64mk2
this is meant to be a WinXPx86 compatible release, but GlideN64 doesn't work there. still default away from jabo :U
2018-06-04 22:11:29 +03:00
feos 595bed1e89 disable Cache Size option in gliden64, but disaplay the value it forces internally 2018-06-02 09:38:37 +03:00
feos 42c308a12a n64: actually default to gliden! 2018-06-01 11:49:38 +03: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
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
nattthebear e3fab1a4d5 cleaner 2017-05-02 18:15:33 -04: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 ded1c2d7b7 Break off BoardName from IEmulator into a separate IBoardInfo service 2017-04-30 21:01:54 -05:00
J.D. Purcell b53502eed8 Spaces -> tabs. 2017-04-15 16:37:30 -04: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
Wyst3r 4c0bfd4764 m64p: Use built-in debugger to avoid major slowdowns when breakpoints are set.
Conflicts:
	BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs
2017-02-24 10:41:22 +03:00
feos 39c5aae61b Revert "Merge pull request #731 from Wyst3r/master"
This reverts commit 318abf691a, reversing
changes made to 5d4c8020c2.
2017-02-23 16:56:38 +03:00
Wyst3r d665bad4c5 Merge branch 'master' into master 2017-02-22 19:51:13 +01: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 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
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 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
Wyst3r 86b16a80d6 m64p: Use built-in debugger to avoid major slowdowns when breakpoints are set. 2016-11-19 12:02:39 +01:00
feos 9d4ba478ce n64: use traditional GPR names for debugger too 2016-11-03 20:01:22 +03:00
Sappharad 07a1709dbb Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/tools/GameShark.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
2016-10-18 18:23:07 -05:00
pjgat09 78942a8422 N64: Added cxd4 to the RSP options 2016-09-27 15:10:38 -04:00
pjgat09 32be471382 GLideN64: Changed UseNativeResolutionFactor to an int setting 2016-09-26 11:13:07 -04:00
pjgat09 7f24960ed8 M64p: String parameters can now be passed to the core. 2016-09-22 14:21:51 -04:00
pjgat09 59e43a25f9 GLideN64: Added settings to the plugin dialog. Removed some settings from the sync settings that we will not need. 2016-09-22 12:57:09 -04:00
pjgat09 a85da435f9 GLideN64: Added a sync settings, hooked up the dll, and added it to the video plugin list in the plugin dialog. Updated the submodule reference. 2016-09-22 08:46:49 -04:00
Sappharad cb8382a151 Merge branch 'master' into mono-portable 2016-09-01 20:45:39 -05:00
feos f08a0b3849 n64 tracer: disable for dynarec 2016-08-24 19:21:16 +03:00
Sappharad 3cf4d3464d Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/tools/TraceLogger.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2016-08-23 21:21:57 -05:00
feos 2d8a247bec m64p: fix spacing, add fgrs to tracer 2016-08-21 12:46:29 +03:00
feos 76eaea3619 tracer unification for cores: spacing, headers, etc 2016-08-16 01:39:26 +03:00
feos 799afc6b0a n64: switch to regular tracer method
todo: same for gpgx
2016-08-14 20:35:05 +03:00
feos 45a83322a7 n64 tracer: mention regs in the header 2016-08-14 19:20:18 +03:00
feos 473b9e5f33 m64p tracer:
- shrink core's disasm string a bit
- nicely print registers (r0 and co-processors regs are dropped though)
- rebuild dll
2016-08-14 17:49:56 +03:00
feos d4c7175910 N64.ITraceable: log non-zero regs
still gigantic file for 1 frame

todo: implement internal tracer instead
2016-08-14 01:12:53 +03:00
zeromus 6d32112c9e fix gpgx, n64 trace loggers 2016-08-13 16:34:01 -05:00
feos 49176b28bd m64p: setup CallbackBasedTraceBuffer 2016-08-13 20:36:26 +03:00
feos d5ac190bdc m64p: don't freeze on breakpoint
debugger: indicate break hit
2016-08-13 16:26:10 +03:00
feos dc68b90cd0 m64p: exec breakpoint occurs, but freezes in HackyPinvokeWaitOne() 2016-08-12 00:35:52 +03:00
feos 80c90e7acc m64p: attempt to add execute callback
no memory callback seems to be working yet though
2016-08-11 21:58:09 +03:00
Sappharad 2e4720cae9 Merged branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.Common/BizHawk.Client.Common.csproj
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Common/InstanceDll.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	vbanext/instance.cpp
2016-05-03 21:51:47 -05:00
nattthebear 111648cf98 Break a bunch of memory domain stuff with pointless refactoring 2016-04-13 19:50:06 -04:00
Sappharad 43fa37f5d0 Merge Pull request 28cc5f6621 incorrectly because it's so old that it won't patch. 2016-03-08 20:59:25 -06:00