Commit Graph

13 Commits

Author SHA1 Message Date
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
nattthebear 72adbbf898 lynx 64 bit build. not gonna lie - this system is pretty disappointing 2016-03-01 22:47:16 -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
goyuken fa8934b1d4 lynx: memory domains. R/W: RAM, Save Ram. R: Cart A, Cart B. 2014-11-02 19:11:19 +00:00
goyuken ea6a61b4fb lynx: automatically rotate the 7 games that used it, yay 2014-10-15 04:58:27 +00:00
goyuken e74580a14a lynx: fix an emulator crash that occurred on certain instances of emulated game crash 2014-10-13 21:42:53 +00:00
goyuken 4868856160 fix batmens for lynx 2014-10-10 01:17:47 +00:00
goyuken a806aa15e3 lynx: fix complete system hang at about 15k frames in every time 2014-09-29 20:40:19 +00:00
goyuken ee1f84bb4a lynx: savestates. should work pretty well, but format is subject to change 2014-09-29 20:13:26 +00:00
goyuken 6e1932c8bd lynx: lag indicator 2014-09-29 18:53:53 +00:00
goyuken d9258cc4b9 lynx: saveram. unfortunately, handy gives every cart with only a single ROM bank a saveram, whether or not it's needed or used. perhaps a future gamedb project, perhaps not... 2014-09-29 18:46:55 +00:00
goyuken bacbaa2bec lynx: controllers and frame timing fix 2014-09-16 00:40:15 +00:00
goyuken 28a37a57da lynx mah boi https://www.youtube.com/watch?v=bNpLXo55yfw 2014-09-15 20:12:11 +00:00