Commit Graph

28 Commits

Author SHA1 Message Date
Sappharad 5cbd34b41f Corrected a build error caused in the merge. 2019-10-06 18:42:19 -05:00
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
feos 51b2843fed bsnes: send vcounter and hcounter among registers 2018-04-23 21:04:46 +03: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
zeromus 5b44f0960f snes: support trace logging GB and SMP cores (C# side and dlls) 2017-05-14 13:51:02 -05:00
zeromus c641e163f9 SGB CDL c# side; and fix SGB loading (broken by pwrap refactors) 2017-05-06 16:23:26 -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 f108673449 fix some embarrassing bugs in new snes interop. maybe biz will be more stable now. 2017-04-18 22:09:04 -05:00
zeromus 2e286317f2 tidy snes 2017-04-17 22:49:17 -05:00
nattthebear 0393e9241b coreside, this is a short, so yeah... 2017-04-16 18:08:57 -04:00
zeromus 23fb06a0cd c++ side setup for setting any devices on snes input ports 2017-04-09 16:45:05 -05:00
Sappharad 2664baf098 - Fix the SNES DLL check for builds in release mode.
- Flip the back slashes because Visual Studio doesn’t like them
- Update my release build script to chmod cgc and ffmpeg, because somehow ffmpeg lost the executable flag.
- Update version to 1.12.1
2017-04-02 20:59:51 -05:00
Sappharad 145dd8d1c3 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-03-15 18:02:46 -05:00
zeromus b4ad2f40d9 snes c# cleanup 2017-03-15 17:49:19 -05:00
Sappharad 740f69b8db Another failed attempt at SNES support on macOS. Crashes in snes_load_cartridge_normal, I believe Mono doesn’t actually support cross-process MemoryMappedFiles, so this is dead again. 2017-03-14 22:03:38 -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 598e173d60 snes: tidy 2017-03-08 15:57:00 -06:00
zeromus 19b38bfd90 snes: fix CDL, trace logger 2017-03-06 05:32:09 -06:00
zeromus fbd7601b77 for evaluation:
overhaul snes core -- radically simplify IPC.

There were two goals
1. speedup (failed)
2. not break in the old way of becoming unstable when GC happens (uncertain)
3. lay framework for simplified libretro interface (success, provisional on #2)

the speedup failed, I think, because a slower libco is needed to coexist with .net. I think I will fix this be incorporating both libcos, one for bsnes internal use, and one for .net<->c++ switching
2017-03-06 05:21:35 -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 f3626b9605 snes CDL 2015-11-03 23:45:57 -06:00
zeromus 817f4360d3 bsnes is a dll once more. this is experimental--it may not work well, so I need to gather data. But I think it might work fine. 2015-10-24 03:06:47 -05:00
Sappharad b140811080 Changes that make BSNES try to run on OS X. Can not proceed further, due to lack of support for named pipes in Mono. 2015-07-19 20:13:04 -05:00
zeromus 237045fde2 add watchdog timer to bsnes process to make sure they dont accumulate when the frontend terminates oddly 2014-06-17 22:03:08 +00:00
zeromus 50ef1b19f5 snes-fix bugs caused by breakpoints leaving emulator state unstable (most noticeable when taking savestates) 2013-12-29 02:20:13 +00:00
zeromus 492a99694f fix snes savestates? 2013-11-25 20:51:26 +00:00
zeromus 4c247672fe snes hooking system and GetCpuFlagsAndRegisters now work normally 2013-11-22 09:33:56 +00:00
adelikat 7e45f13282 Change project name BizHawk.Emulation to BizHawk.Emulation.Cores 2013-11-15 14:05:47 +00:00