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
|
16bf63ade8
|
Random cleanups.
|
2017-04-10 09:36:04 -04:00 |
|
Sappharad
|
d68d961ef8
|
Merge branch 'master' into mono-portable
|
2017-04-02 20:03:31 -05:00 |
|
zeromus
|
e484a69950
|
put RemoveMOTW back in the EXE assemblies. They can't load MOTW'd dlls which contain RemoveMOTW. We still need the RemoveMOTW code in a shared place for externalcores.
|
2017-03-21 11:09:43 -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
|
6b298f07f2
|
do WhackMOTW after redirecting the dll directories fully, so that the shared RemoveMOTW that I moved to a common assembly can be found (wild guess)
|
2017-02-23 05:27:27 -06:00 |
|
Sappharad
|
df2a6c8154
|
Merge branch 'master' into mono-portable
Conflicts:
BizHawk.Client.EmuHawk/MainForm.cs
|
2017-02-21 20:02:00 -06:00 |
|
zeromus
|
569113f2f8
|
fix #741, maybe, by removing MOTW from external cores before interrogating them. Will it still trigger when running them, if that's done somehow before interrogating them? (untested)
|
2017-02-21 18:23:02 -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 |
|
Isotarge
|
0bf5482af4
|
Fix typo
Thanks to Keeta for pointing this out
|
2016-11-23 00:04:49 +10:30 |
|
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
|
d786292ccf
|
remove unused code Apply MOTW code
|
2016-01-14 01:51:40 -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 |
|
adelikat
|
b8242a4fc5
|
Add MultiHawk, an alternate client capable of loading multiple roms at once, and supports movie recording to a single movie file, if you don't know already, this is a useless tool for you
|
2015-03-01 16:37:51 +00:00 |