Commit Graph

16 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 2a0e859a85 Add 64 bit build (doesn't work yet), move SlimDX.dll 2016-02-28 15:06:03 -05:00
Sappharad cd0c68d5ef Fix DiscoHawk so it runs on Mono. 2015-12-23 19:10:27 -06:00
Sappharad 74d7bf32b6 Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	Version/version.csproj
2015-07-15 21:42:53 -05:00
zeromus 962b567f6d repair discohawk and cleanup. remember to re-add CCD exporting 2015-07-11 13:46:37 -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 80164c1fba import WIP discsys work from svn 2015-06-23 13:57:11 -05:00
jdpurcell 0a345b0084 Issue 368: Set all platform targets to x86, rename build platforms to match, and remove unused build platforms. 2015-01-13 15:28:58 +00:00
zeromus e80de55210 disc - add a project including mednafen's disc-loading code, for a/b testing bizhawk's disc loading on large disc sets, and add an example a/b test using it. 2014-12-25 19:56:04 +00:00
zeromus e0c09a553b redo how subwcrev stuff is done, so that the subwcrev process doesnt have to run for every project. improves build times. 2014-12-09 19:20:22 +00:00
zeromus 29b217b587 big discsystem refactors and preliminary CCD handling. not to be considered stable, but ill start supporting it. 2014-12-04 05:40:10 +00:00
goyuken 95f874d3a5 cnrom musings 2014-01-10 18:28:37 +00:00
adelikat fe7da7c5b5 move disc stuff out of BizHawk.Emulation into a new project BizHawk.Emulation.DiscSystem, updated namesspaces in those files, set up other projects with the right references and usings 2013-11-03 23:45:44 +00:00
adelikat cd856a0011 move output folder up one level 2013-11-03 14:06:46 +00:00
adelikat 049e45a7f4 some more DiscoHawk reorg 2013-11-03 13:19:36 +00:00
adelikat 426c628fdf Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk 2013-11-03 12:28:33 +00:00