Commit Graph

119 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 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 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 6f049c2ab8 discsys/psx - dont crash when reading absurdly negative LBAs 2015-09-17 18:18:06 -05:00
zeromus bafe41fa54 discsystem - successfully parse cues that are bigger garbage 2015-09-16 14:37:42 -05:00
zeromus 8f5059d53e discsystem - handle some errors that werent handled before 2015-09-16 14:27:28 -05:00
zeromus a3ff5b0d8c improve discohawk reliability 2015-09-10 16:54:02 -05:00
zeromus 66c2d48e8d throw slightly more descriptive warning when loading a cue with a missing bin 2015-08-08 16:40:37 -05:00
Sappharad a14c5ad11b Merge branch 'master' into mono-portable 2015-07-25 22:52:28 -05:00
zeromus a721596fb6 disc - fix error in SBI application 2015-07-23 11:18:20 -05:00
zeromus d0fee54834 enable backup identification of PSX discs through ISO filesystem 2015-07-20 18:00:20 -05:00
zeromus 60c3eb9883 cue files - prefer a pre-decoded wav over an mp3 with the same filename 2015-07-19 22:15:10 -05:00
Sappharad bc3cc6928f Merge up to what I think is the 1.11 revision. 2015-07-19 20:30:48 -05:00
zeromus 9d3888a8a4 disc - restore intended crash-free handling of slow loading abort 2015-07-19 11:59:47 -05:00
zeromus 62f7e7d1f2 disc - support .img.ecm 2015-07-18 23:53:13 -05:00
zeromus a0e623ef1b disc - some unneeded code cleanup 2015-07-18 23:53:12 -05:00
zeromus 4d2e3573f1 disc - fix the SeekTrack method 2015-07-18 20:06:46 -05:00
zeromus 21c5566602 fix some flags on leadin and leadout tracks 2015-07-17 16:55:45 -05:00
zeromus f95f9af470 fix error in 2048 byte sector reading 2015-07-16 09:31:18 -05:00
Sappharad 74d7bf32b6 Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	Version/version.csproj
2015-07-15 21:42:53 -05:00
zeromus af8842c24f fix little bug in leadout synthesis 2015-07-14 21:49:58 -05:00
zeromus 01987abac4 allow mednadisc to use its own leadout track generator 2015-07-14 21:47:45 -05:00
zeromus e6e1716c02 basic leadout track synthesis 2015-07-14 21:42:31 -05:00
zeromus 64aa41c0e3 prepwork for sector synthesis provider 2015-07-14 21:04:27 -05:00
zeromus 56e3416de2 improve rom status report for PSX, and generate one for the M3U scenario 2015-07-12 20:23:27 -05:00
zeromus 7bec7b806b add PSX disc hashing tool 2015-07-12 20:08:30 -05:00
zeromus 4c29f27bc0 fix CCD track 1 pregap synthesis 2015-07-12 18:04:55 -05:00
zeromus b5d3ff4397 refactor cue code to be less weirdly structured and partial-classy 2015-07-12 17:45:20 -05:00
zeromus 4fffa64f9a add better tracking for slow disc loads 2015-07-11 13:47:05 -05:00
zeromus 31267ce85a fix little bug in mednadisc loading 2015-07-11 13:47:02 -05:00
zeromus 95deb6f3f9 add special crc combiner for redump stuff 2015-07-11 13:47:02 -05:00
zeromus 91eecdca52 fix fact that "fix error in subcode in ReadLBA_2352" is senseless 2015-07-11 13:47:01 -05:00
zeromus aad1e0608c add PSX disc hashing code and batch runner 2015-07-11 13:47:01 -05:00
zeromus dafc0bb3e8 fix error in subcode in ReadLBA_2352 2015-07-11 13:47:00 -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 bdb64ce251 clarify disc ID process comments a bit 2015-07-11 13:47:00 -05:00
zeromus 1026c817cc more discsys reorg 2015-07-11 13:46:58 -05:00
zeromus 41d5875baf big discsys reorg.. move all API parts into Disc*-named files in root and hide more private stuff 2015-07-11 13:46:58 -05:00
zeromus e84d212cea cleaning up cue format 2015-07-11 13:46:57 -05:00
zeromus 691531421a more discsys reorg 2015-07-11 13:46:57 -05:00
zeromus 33f23e137d cleanup unused Blob_ZeroTypeStuff and general reorg 2015-07-11 13:46:57 -05:00
zeromus 67468e93ec discsys reorg and move CDAudio to BizHawk.Emulation.Common for cleaner assembly reference dependencies 2015-07-11 13:46:56 -05:00
zeromus 57d76317c8 some small discsys cleanup 2015-07-11 13:46:56 -05:00
zeromus 3ebdfaaf78 cleanup of old sector synth classes 2015-07-11 13:46:55 -05:00
zeromus cc31331bc0 refactor discstructure mightily 2015-07-11 13:46:55 -05:00
zeromus 5e71224eda reorg and cleanup of old interfaces, stop populating q_crc for RawTOCEntry instances 2015-07-11 13:46:37 -05:00