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
..
Octoshock.IDebuggable.cs	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
Octoshock.IDisassemblable.cs	setup psx tracer because why not	2016-08-21 21:19:48 +03:00
Octoshock.ITraceable.cs	Merge branch 'master' into mono-portable	2017-05-02 20:38:56 -05:00
Octoshock.cs	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
OctoshockDll.cs	psx: support negcon (c# side)	2017-04-25 22:59:46 -05:00
OctoshockFIOConfig.cs	psx: fix non-multitap input	2017-04-30 13:36:18 -05:00
PSF.cs	fix loading PSF with no tags	2015-07-25 18:01:38 -05:00