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

64 Commits

Author SHA1 Message Date
Sappharad ee84e5981c Merge remote-tracking branch 'origin/1.x' into mono-portable 
# Conflicts:
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
#	libmupen64plus/mupen64plus-win32-deps
#	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2019-10-03 21:33:28 -05:00
vadosnaprimer 44902f4069 nlua doesn't exist in this branch 2018-01-02 16:43:34 +03: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
J.D. Purcell bb95ccf82d Update SharpZipLib (from 9ad7f58 on 2016-12-04 with target framework changed to 4.0). Should fix #834. 2017-04-25 23:17:04 -04:00
alyosha-tas 1679c1b565 Fix #815 2017-04-17 14:43:42 -04:00
Sappharad df2a6c8154 Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.cs
 2017-02-21 20:02:00 -06:00
zeromus 701fcf4853 try installing luasockets, since it seems the prebuilt exception handling interferes with ours (fix confirmed by revo-tpp users) 2017-02-18 14:19:46 -06:00
adelikat 2868d921e0 compile emu7800 in release mode, fixes #795 2017-02-07 20:00:28 -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
adelikat 75654b9f33 Atari 7800 - make difficulty switches behave like toggles instead of buttons, also add mnemonic info for them, fixes #726 2016-11-11 08:44:28 -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 96416e13d9 fix regressions in lua's support for UTF-8 strings, likely created around the time of the sandboxing. 2016-05-23 14:33:36 -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 bef6ddef67 Add x64 target to luainterface. Build and add to references 2016-02-28 20:12:39 -05:00
zeromus f83d00d87d supposedly a x64 slimdx. is it really? 2016-02-28 19:02:45 -06:00
nattthebear a87096fb85 Move around LuaInterface.dll as well in preparation for 64 bit build 2016-02-28 16:10:18 -05:00
nattthebear 2a0e859a85 Add 64 bit build (doesn't work yet), move SlimDX.dll 2016-02-28 15:06:03 -05:00
adelikat f5e679fa0d Refactor ITraceable to work on TraceInfo objects that separate Disassembly and Register information. Make Tracelogger two columns. 2016-02-21 17:34:42 -05: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 dfc139376a fix lua dlls on windows xp after changing to vs2015 building 2015-12-20 05:04:23 -06:00
zeromus 4f9061c45e update lua vcxproj to vs2015. rebuild dlls. should hide the floating point precision on n64 problem, but i still suspect theres badness 2015-12-16 16:34:33 -06:00
zeromus 27f2ad0f24 Revert "activate luaperks version of lua". Never mind, we no longer have evidence that we need this. We'll keep it stashed until we do. 
This reverts commit 75d5abbf71.
 2015-11-02 01:08:55 -06:00
zeromus 75d5abbf71 activate luaperks version of lua 2015-11-02 00:28:38 -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 e7bfc73b92 add a slimdx overload I needed 2015-08-22 02:55:23 -05:00
Sappharad 74d7bf32b6 Merge branch 'master' into mono-portable 
Conflicts:
	.gitignore
	Version/version.csproj
 2015-07-15 21:42:53 -05:00
scrimpeh bcbc588e05 Apple II - Fix Memory and Input Callbacks interacting with savestates 2015-07-06 22:09:18 +02:00
scrimpeh 23d93cc1fe Apple II - Add Input Callbacks, Change definition of a lag frame 2015-07-06 21:15:48 +02:00
scrimpeh f472b4802d Apple II Breakpoints - Fix Write Breakpoints 2015-07-05 17:12:46 +02:00
scrimpeh 43dd015b51 AppleII - Add MemoryCallbacks, Breakpoint Support, Set Registers in Debugger to proper bit size. 2015-07-05 17:09:07 +02:00
scrimpeh 486bf49094 Apple II trace logger - remove vestigial stuff 2015-06-24 16:04:39 +02:00
scrimpeh 4b9ed33954 Apple II trace logger - fix crashes on loadstate, sanity check on printing opcodes 2015-06-24 16:00:19 +02: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
nattthebear 77d3369d26 Some stuff for loading elves. Not yet all finished. 2015-06-23 21:35:34 -04:00
goyuken ae4881356e appletwo: fix mono setting being borked on loadstate 2015-06-21 14:40:58 +00:00
scrimpey 02b71ab377 Apple II - Add Trace Logging functionality 2015-06-21 14:31:18 +00:00
scrimpey 4b1547384b Implemented AppleII.SetCpuRegister 2015-06-15 21:29:28 +00:00
adelikat a99c0787a8 Apple II - implement IDisassembler, and IDebuggable.GetCpuFlagsAndRegisters() 2015-06-12 23:51:03 +00:00
goyuken 44b47f96a1 apple 2 keyboard: fix oopsie that made nearly every key combination with ctrl or shift or caps active invalid 2015-05-30 14:50:53 +00:00
adelikat f5daee2623 Virtu core - remove SupressMessage attributes, also change tabs to spaces in files I touched 2015-05-20 01:28:50 +00:00
adelikat edbb7508b5 Apple II - Virtu Core - remove String.cs shenanigans 2015-05-20 01:22:26 +00:00
goyuken facee4e113 Fix oopsie 2015-05-20 00:12:19 +00:00
goyuken ef20ef1991 [JsonIgnore] an unneeded part of Apple II video core 2015-05-19 23:49:19 +00:00
goyuken 46c374f8a3 ye olde drive lighte 2015-05-19 23:33:50 +00:00
goyuken 894cae0c52 apple 2 savestates: custom Type handling to be more resilient to assembly changes 2015-05-19 23:27:28 +00:00
goyuken 704ace5eb7 AppleII - don't savestate unneeded AV buffers. 2015-05-19 22:01:13 +00:00
goyuken 8cbaf6304a clean up array handling in apple 2 savestates 2015-05-19 21:39:29 +00:00
goyuken 15b29de1c2 AppleII: Savestate MegaFun. All existing savestates are obsoleted. 2015-05-19 01:20:35 +00:00
goyuken d91e6f184a Add support for binary savestate as BSON, but turn it off and make binary savestates a stupid text clone because BSON sucks 2015-05-18 01:52:14 +00:00
adelikat 44027bc6de compile Virtu.dll in release mode 2015-05-18 01:00:57 +00:00