Commit Graph

22 Commits

Author SHA1 Message Date
Sappharad 6660b93b2d Fresh builds of the cores that seem to have been updated. 2017-05-23 21:07:24 -05:00
Sappharad 7998f6374c Merge branch 'master' into mono-portable 2017-05-03 17:36:32 -05:00
zeromus 286d03a359 psx: fix flaky MODE button on dualshock (disabled by uninitialized memory randomly on bootup) 2017-05-03 16:24:47 -05:00
Sappharad c93697baee Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
	BizHawk.Client.Common/BizHawk.Client.Common.csproj
	BizHawk.Client.Common/lua/LuaSandbox.cs
	BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
	BizHawk.Client.Common/tools/Cheat.cs
	BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Client.EmuHawk/movie/RecordMovie.cs
	BizHawk.Client.EmuHawk/tools/GameShark.cs
	BizHawk.Emulation.Common/Interfaces/IInputPollable.cs
	BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
	BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
	BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs

BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.c
s
	BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
	BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
	Dist/changelog.txt
	output/Lua/Genesis/Earthworm Jim 2.lua
	output/Lua/SNES/Super Mario World.lua
	output/dll/mgba.dll
	quicknes/bizinterface.cpp
	quicknes/mingw/Makefile
2016-03-07 20:34:23 -06:00
zeromus 5f86fa5953 64bit octoshock 2016-03-01 21:58:01 -06:00
Sappharad 9a19a5560c - Shock the octopus and bat the goomba.
- Version number, native dialog updates.
2015-10-15 21:49:20 -05:00
Sappharad 4fd45964c0 Merge branch 'master' into mono-portable
Hopefully I didn't botch this, I'm not good at how git handles conflicts yet.
2015-10-12 21:34:13 -05:00
zeromus c9838d668a psx - hook up new controller configuration, to support 0-2 pads and 0-2 memcards. Not tested very well yet. no multitap this release. 2015-10-03 17:27:52 -05:00
zeromus c942350beb psx - re-add mednafen's disc error correction capability 2015-09-13 19:17:17 -05:00
Sappharad 74d7bf32b6 Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	Version/version.csproj
2015-07-15 21:42:53 -05:00
zeromus ae22972e25 psx - build with vs2015, so we can pass mednafen's internal integrity checks, and force a widespread test of vs2015-built unmanaged dlls 2015-07-12 18:48:39 -05:00
Sappharad 5b466e5d70 New portable branch re-created from master with hopefully all of the changes made to the old one, plus some cleanup of things that got mangled from repeated merges. 2015-06-23 22:22:11 -05:00
zeromus 36f9145483 psx - update to 0.9.38.1 level mednafen 2015-02-15 17:57:07 +00:00
zeromus b129eab0f9 psx - lag logic 2015-01-06 03:40:01 +00:00
zeromus a226f61f7c psx - remove unused CD subsystem code, now that i've decided to resurrect it in a separate module. 2014-12-24 22:27:29 +00:00
zeromus 08608b0137 merge osx octoshock work to trunk 2014-12-17 04:12:32 +00:00
zeromus bcf053d0e9 psx - big update from upstream (0.9.36.5 -> 0.9.37-UNSTABLE) 2014-12-16 05:04:55 +00:00
zeromus 2cd1ef1c63 psx - savestates 2014-12-12 11:07:47 +00:00
zeromus 326a865c01 psx - framework for savestates, but syncers not implemented yet 2014-12-12 00:25:46 +00:00
zeromus 5f6bb8d8fd octoshock! 2014-12-10 19:41:13 +00:00
zeromus c909f95b30 lets try this again, sorry for the noise 2014-06-20 04:41:25 +00:00
zeromus 61bcd046dd reorg 2014-06-20 04:37:01 +00:00