Commit Graph

11 Commits

Author SHA1 Message Date
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
J.D. Purcell b53502eed8 Spaces -> tabs. 2017-04-15 16:37:30 -04: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
zeromus a7d2b8d7f7 * add a new IToolForm update mechanism which has extensible update points (so a tool can both pre- and post- update)
* make trace logging "core-pushes" model, to a sink installed by the frontend. This sink can go straight to the disk without wasting memory if that's what the Trace Logger tool has selected; or the Trace Logger will buffer it if it needs to.  Formerly, we had a "core-pushes-to-buffer" and "client-pulls-once-per-frame" which necessarily caused huge buffers no matter what was going on.
2016-08-13 15:31:26 -05:00
Sappharad ed88569221 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
	BizHawk.Client.EmuHawk/movie/RecordMovie.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2016-02-15 18:38:48 -06:00
adelikat 6f75ef6dba Move another function to ToolFormBase 2016-01-30 21:07:03 -05:00
Sappharad d2a6542c6e Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Client.EmuHawk/GLManager.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes.cpp
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2015-12-21 21:58:13 -06:00
adelikat 752235b848 NES Music ripper tool - clean it up slightly to be more presentable 2015-12-20 12:51:05 -05:00
Sappharad 39bc6cbb8b Added native file save dialogs on OS X. 2015-07-26 20:14:18 -05:00
scrimpeh 9b6ff71cac Enably NES Music Ripper only with NESHawk, also throw out vestigial method in HotkeyConfig. 2015-07-24 18:26:14 +02:00
zeromus 6833a24638 add NES music ripper tool prototype 2015-05-08 00:56:46 +00:00