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
|
f31f3af0c8
|
InstanceDLL - throw if _hModeule == IntPtr.Zero, advanced loader - show the error if one occured
|
2017-05-04 19:43:51 -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
|
d7b0043379
|
add HModule accessor to InstanceDll
|
2017-04-17 22:42:12 -05:00 |
|
adelikat
|
3965af851f
|
Misc code cleanups in BizHawk.Common
|
2017-04-13 13:57:58 -05: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 |
|
nattthebear
|
3bc6fe1b04
|
Add the elf stuff back to solution (doesn't do anything, don't use, ugly and embarassing, etc). Switch gpgx to use bizinvoker and slash a few hacks there. Bizinvoker - add support for forwarded attributes in Compatibility mode ([Out], [In]), and support enum, ref enum, and enum[]. Misc cleanup.
|
2016-03-10 22:00:52 -05:00 |
|
Sappharad
|
b1439cb440
|
Attempted to add OS X support for LibRetro dylib loading. Implemented, but crashes at the moment due to a malloc error??? Not sure if this a Mono bug, or if I messed up.
|
2015-12-23 18:52:06 -06:00 |
|
Hathor86
|
c7dcb42b94
|
Merge from maser@TASVideos
|
2015-11-15 11:27:00 +01:00 |
|
zeromus
|
5afa44bbec
|
common logic for tempfiles
|
2015-11-15 03:01:58 -06:00 |
|
Hathor86
|
5c36c16160
|
Fixing merge
|
2015-11-08 22:57:54 +01:00 |
|
Hathor86
|
cc2c888870
|
Merge remote-tracking branch 'refs/remotes/TASVideos/master'
Conflicts:
BizHawk.Client.EmuHawk/MainForm.Designer.cs
BizHawk.Client.EmuHawk/MainForm.cs
BizHawk.Client.EmuHawk/tools/CDL.Designer.cs
BizHawk.Client.EmuHawk/tools/CDL.cs
BizHawk.Client.EmuHawk/tools/CDL.resx
BizHawk.Common/InstanceDll.cs
BizHawk.Emulation.Common/CodeDataLog.cs
|
2015-11-08 22:41:51 +01:00 |
|
zeromus
|
cbdf6a2acc
|
after i fix a regression from a couple of commits ago which broke multi-instance dlls (affecting only bsnes otherwise right now)
|
2015-11-07 12:05:26 -06:00 |
|
zeromus
|
7651f418fe
|
usably functional libretro player
|
2015-11-07 00:14:59 -06:00 |
|
Hathor86
|
f70a2c8c6c
|
Merge from TASVideo
|
2015-11-01 22:01:19 +01:00 |
|
zeromus
|
18aeefb66a
|
add InstanceDll
|
2015-10-24 03:03:29 -05:00 |