ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,306 Commits 95 Branches 91 Tags 2.5 GiB
Commit Graph

136 Commits

Author SHA1 Message Date
Sappharad 71e34339a3 Merge branch 'master' into mono-portable 
# Conflicts:
#	BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
 2017-06-16 22:57:52 -05:00
alyosha-tas 93254b4b6e Update RomLoader.cs 
Fixes #865
 2017-06-16 10:35:41 -04:00
Sappharad 464bba9454 Merge branch 'master' into mono-portable 
# Conflicts:
#	BizHawk.Client.EmuHawk/MainForm.Events.cs
#	BizHawk.Client.EmuHawk/Properties/Resources.resx
#	BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
 2017-06-04 19:31:56 -05:00
adelikat 6dcaebb0d7 Disable Atari7800Hawk from release builds 2017-06-03 12:54:00 -05:00
adelikat be39513b9e C64 - show mapper info in rom annotation, if rom is a cart 2017-05-27 11:57:38 -05:00
adelikat 8de4e7bff9 add ui to switch to Atari7800Hawk, still not useable by humans, needs gamedb stuff 2017-05-27 08:56:25 -05:00
adelikat 47758a519d delete more meteor stuff 2017-05-27 07:51:11 -05:00
Sappharad 5573409fad Merge branch 'master' into mono-portable 
# Conflicts:
#	BizHawk.Client.Common/Extensions.cs
#	BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
#	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
#	BizHawk.Client.EmuHawk/MainForm.Events.cs
#	BizHawk.Client.EmuHawk/MainForm.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
#	BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs
#	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
#	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2017-05-23 20:32:48 -05:00
adelikat 70baf9d306 Client.Common cleanups 2017-05-18 11:36:38 -05:00
adelikat 2a54517b52 more misc Client.Common cleanups 2017-05-17 13:18:26 -05:00
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -04:00
adelikat e0985465b6 misc Client.Common code cleanups 2017-05-09 13:19:55 -05:00
adelikat cdb0802230 Misc Client.Common cleanups 2017-05-09 07:22:56 -05:00
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
zeromus e9229747d7 new libretro WIP with libco support. Still missing sound, saves, many small details. Will undergo heavy organizational revisions. 2017-04-17 22:49:08 -05:00
J.D. Purcell b53502eed8 Spaces -> tabs. 2017-04-15 16:37:30 -04:00
adelikat b6f335e4c8 misc code cleanups in BizHawk.Client.Common 2017-04-14 14:59:01 -05:00
Sappharad df2a6c8154 Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.cs
 2017-02-21 20:02:00 -06:00
zeromus 64e4585582 oops, fix copy/paste error from the other day which broke gpgx in 32bits mode 2017-02-11 20:17:14 -06:00
zeromus 2e34d91869 small repairs to get gpgx64 running again 2017-02-09 22:40:16 -06:00
Sappharad c6eb2dbb47 Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.Events.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
 2016-12-05 21:47:31 -06:00
zeromus 327606234f fix can't use neshawk (recent regression) 2016-11-19 20:07:17 -06:00
zeromus 595a207c97 add new field to gamedb to specify which core should be used. 
allow it to be 'neshawk' or 'quicknes'.

this should only be employed by end-users; we won't make those choices in the gamedb officially.

the quicknes blacklist is still implemented separately.

yeah, that's a lot of prioritization levels.
 2016-11-12 19:23:54 -06:00
Sappharad 3cf4d3464d Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/tools/TraceLogger.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2016-08-23 21:21:57 -05:00
feos 35282ba577 gpgx32: flipped namespaces, added excplicit core picking 
diff is messed up after folder renaming, but no file was changed except for namespaces and waterbox's core name
 2016-08-10 22:27:46 +03:00
Sappharad 2e4720cae9 Merged branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.Common/BizHawk.Client.Common.csproj
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Common/InstanceDll.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	vbanext/instance.cpp
 2016-05-03 21:51:47 -05:00
Tony Konzel 93fcb293d8 C64: Fix the build post-merge (derp.) 2016-03-15 11:38:55 -05:00
Tony Konzel 05914e1490 Merge pull request #599 from TASVideos/c64-via-timer-fixes 
C64 via timer fixes (and more)
 2016-03-15 10:08:17 -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
Anthony Konzel 8fd552274e C64: Discover file formats heuristically instead of by filename. 2016-03-05 15:23:22 -06:00
adelikat 234cc2e5d8 Get started on C64 support in the multi-disk bundler 2016-03-04 21:50:24 -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 2765961984 load NSF without annoyance 2015-12-31 12:37:48 -06:00
Sappharad d2a6542c6e Merge branch 'master' into mono-portable 
Conflicts:
	.gitignore
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Client.EmuHawk/GLManager.cs
	BizHawk.Client.EmuHawk/MainForm.cs
	BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes.cpp
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2015-12-21 21:58:13 -06:00
zeromus 53fcc09c08 various bugfixes to system/save pathing and support CAN_DUPE, to stabilize the gambatte and neopop cores 2015-11-08 19:18:08 -06:00
zeromus b745d5776a tidy libretro core info and use recommended extensions 2015-11-07 19:59:10 -06:00
zeromus 5c16f8b107 fix some assorted bugs, and experiments with handling more environment calls 2015-11-07 02:29:04 -06:00
zeromus 7651f418fe usably functional libretro player 2015-11-07 00:14:59 -06:00
adelikat 75e6216ca2 Rom Loader - don't call message boxes, use the error callback 2015-10-17 19:11:04 -04: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
Kabuto 004c8294fb c64 core uses ISettable now and supports 2 more video standards 2015-09-28 23:52:23 +02:00
zeromus 8f5059d53e discsystem - handle some errors that werent handled before 2015-09-16 14:27:28 -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
zeromus 2a8ed31cbf add a bad PSX dump and change rom status printout a bit 2015-08-08 15:58:17 -05:00
adelikat 2373e5bcd5 Support .xml disc bundling for PSX, note: this is sloppy code and mostly copy pasta, sorry. 2015-08-04 17:19:21 -04:00
Sappharad b7e805e038 Mono: Fix FDS and any other game that needs to recursively call LoadRom(). Another file sharing violation. 2015-07-26 21:34:45 -05:00
zeromus 6e1cde2793 hookup PSF support 2015-07-20 23:11:00 -05:00
zeromus f5f4ded789 add slow load handling for m3u files 2015-07-19 11:59:48 -05:00
zeromus 37aca2bc92 change rom status text to reference accurate PSX menu Hash Discs tool name 2015-07-18 20:08:45 -05:00
zeromus 1f9f712af9 psx - fix loading m3u with non-good discs 2015-07-17 11:48:20 -05:00