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 |
|
nattthebear
|
ebe789eed2
|
heh
|
2017-05-10 07:45:23 -04: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 |
|
adelikat
|
912a2d7346
|
misc code cleanups in AV code
|
2017-04-18 12:27:44 -05:00 |
|
Sappharad
|
39bc6cbb8b
|
Added native file save dialogs on OS X.
|
2015-07-26 20:14:18 -05: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 |
|
adelikat
|
ab5cfab035
|
remove redundant code throughout the emuhawk project
|
2014-06-29 02:28:48 +00:00 |
|
zeromus
|
176c306439
|
proof of concept syncless recorder AV out module
|
2014-06-18 02:28:07 +00:00 |