Commit Graph

44 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
adelikat a8c15a652b Emulation.Common cleanups 2017-04-27 11:37:26 -05:00
Sappharad ecd9800968 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.DiscoHawk/DiscoHawk.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-03-14 20:36:35 -05:00
zeromus 6b298f07f2 do WhackMOTW after redirecting the dll directories fully, so that the shared RemoveMOTW that I moved to a common assembly can be found (wild guess) 2017-02-23 05:27:27 -06:00
Sappharad 849498dfa6 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/Program.cs
2016-06-21 20:48:49 -05:00
zeromus a9c0211d46 change a bunch of old googlecode urls in assemblyinfos 2016-06-13 11:34:27 -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
nattthebear 2a0e859a85 Add 64 bit build (doesn't work yet), move SlimDX.dll 2016-02-28 15:06:03 -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
zeromus d786292ccf remove unused code Apply MOTW code 2016-01-14 01:51:40 -06:00
Sappharad cd0c68d5ef Fix DiscoHawk so it runs on Mono. 2015-12-23 19:10:27 -06: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 a3ff5b0d8c improve discohawk reliability 2015-09-10 16:54:02 -05:00
Sappharad a14c5ad11b Merge branch 'master' into mono-portable 2015-07-25 22:52:28 -05:00
zeromus a0e623ef1b disc - some unneeded code cleanup 2015-07-18 23:53:12 -05:00
Sappharad 74d7bf32b6 Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	Version/version.csproj
2015-07-15 21:42:53 -05:00
zeromus e1f01c980b restore discohawk mp3 ripper functionality 2015-07-11 14:16:56 -05:00
zeromus 901d5c1431 fix some errors with 2442 vs 2448, repair CCD dumping, repair discohawk 2015-07-11 13:47:00 -05:00
zeromus 763c47c3b3 make discohawk a/b comparer run big batches faster 2015-07-11 13:46:59 -05:00
zeromus 691531421a more discsys reorg 2015-07-11 13:46:57 -05:00
zeromus cc31331bc0 refactor discstructure mightily 2015-07-11 13:46:55 -05:00
zeromus 962b567f6d repair discohawk and cleanup. remember to re-add CCD exporting 2015-07-11 13:46:37 -05:00
zeromus 6dcaa3ca04 apply major discsystem refactorings to emulator cores and client. lots of undone things, most notably generalized RawTOCEntries -> TOCRaw -> Structure synthesis outside of the individual format/api disc loaders. IOW there's no DiscStructure right now. Probably lots of bugs too. 2015-07-11 13:46:36 -05:00
zeromus 71022de580 better disc batch testing 2015-07-11 13:46:26 -05:00
zeromus 0d029b4030 batch comparing capability 2015-07-11 13:46:25 -05:00
zeromus 5713346580 cue clarifications 2015-07-11 13:46:22 -05:00
zeromus 1de6033c0a different cue gap sector synth for data and audio sectors 2015-07-11 13:46:21 -05:00
zeromus 017397d91a add DiscMountPolicy to control discrepancies in generation of subQ between different disc interfaces. 2015-07-11 13:46:19 -05:00
zeromus 7deb5e8575 begin rebuilding cue loading based on the new cue compiling system 2015-07-11 13:46:18 -05:00
zeromus fda3ec03ed improve subchannel mismatch reporting during disc a/b testing and add a comment about a failed experiment at a subcode deinterleaving optimization 2015-07-11 13:45:52 -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 eebb923b93 hey discohawk, dont crash when running on xp 2014-12-11 03:09:53 +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
zeromus 9f3763409b call WhackMOTW on .exe, besides just .dll. Fixes bug with windows prompting to allow execution of bsnes executables 2014-11-06 19:04:51 +00:00
goyuken 95f874d3a5 cnrom musings 2014-01-10 18:28:37 +00:00
adelikat 03e9381adc Clean up assembly info stuff in all projects 2013-11-08 15:56:58 +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