88644a7519
1.13.0 fixes for macOS wrapper and minor cleanup.
2017-06-04 20:04:08 -05:00
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
28f9d0ee0d
Remove GlobalWin.CR_GL because it wasn't being used
2017-05-22 14:23:13 -05:00
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
303e8d41e9
Cleanup code to create GUI Renderer.
2017-04-29 17:49:34 -04:00
85c1a42e48
Remove some duplicated code. Also trying some C# 6 stuff, let's see what breaks.
2017-04-09 20:59:23 -04:00
0b81463408
Make sure Direct3D objects get disposed. Fixes all SlimDX warnings when exiting.
2017-04-08 15:18:55 -04:00
a2aba7e3c2
Make sure DirectInput objects are disposed properly. Also includes a better fix for thread safety issues ( #722 ).
2017-04-08 11:49:04 -04:00
5446a636ba
Fix crash on exit when using XAudio2 with the debugger attached.
2017-04-07 22:57:23 -04:00
d68d961ef8
Merge branch 'master' into mono-portable
2017-04-02 20:03:31 -05:00
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
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
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
daceefdd6a
fix build. buzz off.
2017-02-23 04:54:29 -06:00
2bff78f7c6
break the build. buzz off.
2017-02-23 04:42:46 -06:00
df2a6c8154
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/MainForm.cs
2017-02-21 20:02:00 -06:00
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
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
0bf5482af4
Fix typo
...
Thanks to Keeta for pointing this out
2016-11-23 00:04:49 +10:30
849498dfa6
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/Program.cs
2016-06-21 20:48:49 -05:00
a7f03d4c2c
make direct3d9 prereq check non-fatal and make d3d display method initialization fail non-fatal, falling back to gdi+
2016-05-05 09:01:01 -05:00
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
b6efb0a056
fallback to gdi+ in case GuiRenderer can't be created by chosen display method (due to buggy drivers)
2016-04-02 14:33:34 -05:00
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
95bc69b448
some prepwork for opengl texture ID importing (skip rendertarget resolve on OGL display method) but there are still problems and it can't be enabled yet
2016-02-22 00:23:20 -06:00
0eb6e83384
glcontexts can specify versions and clean themselves up
2016-02-21 17:19:34 -06:00
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
bff0d5b95d
add and hook up AWEMemoryStream option for movie storage. GUI is intentionally shoddy to convey sense that it's experimental. Has been cursorily verified but not thoroughly tested.
2016-02-10 01:09:43 -06:00
d786292ccf
remove unused code Apply MOTW code
2016-01-14 01:51:40 -06:00
192458a190
try catching some missing prereqs in emuhawk startup and print a report about it
2016-01-14 01:50:41 -06:00
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
bb327261ae
Add a return value to the main function for various purposes.
...
Add Lua function ExitCode to allow script writers to terminate the client with an exit code.
2015-12-15 22:39:42 -07:00
28eae0dcb1
Revert "Revert "common logic for tempfiles""
...
This reverts commit 5196fc6b70
2015-11-17 17:26:03 -06:00
5196fc6b70
Revert "common logic for tempfiles"
...
This reverts commit 5afa44bbec59048264cd
2015-11-17 17:10:27 -06:00
5afa44bbec
common logic for tempfiles
2015-11-15 03:01:58 -06:00
22192e700b
attempt to make it possible to store movies on disk instead of in memory
2015-11-15 02:27:48 -06:00
283cb4ae50
fix loading of roms from commandline
2015-11-12 17:47:39 -06:00
76731ba0e7
Add TempFileCleaner
2015-10-24 02:48:16 -05:00
595f466ded
add a custom exception display box
2015-10-17 01:18:37 -05:00
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
1e07625d1d
d3d display method: do a better job of surviving device resets
2015-10-11 21:03:16 -05:00
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
4d89558301
fix multihawk opengl window mixup and change GLManager to a singleton to stop that from happening again
2015-03-06 03:05:46 +00:00
bff3d64a4a
-Various fixes, mostly to Undo/Redo.
...
-Changed Program.cs to not use a couple try statements when debugger is attached.
-Implemented the Undo/Redo menu item buttons.
-Ctrl-deselecting frames in TasView now supports dragging.
2015-03-01 19:29:33 +00:00
7155067e89
Remove unused SlimDX.DirectSound usings.
2015-02-22 04:43:52 +00:00
83e8abc963
XAudio2! There's no UI for it yet.
2015-01-31 04:49:53 +00:00
bcfdc755bb
Program.cs - disable warning and use a non-deprecated method, props to HackerCow for pointing this out
2015-01-01 20:54:01 +00:00
09c6072082
Issue 288: Fix two crashes in single instance mode.
2014-12-29 04:20:47 +00:00
b3923283d2
emuhawk - fallback to gdi+ on systems with less than 2.0 opengl
2014-12-16 20:24:14 +00:00
2255e5c9ea
emuhawk - add --gdi commandline so that you can force the program to boot up that way instead of attempting to use a broken opengl by default (take 2)
2014-12-16 19:35:52 +00:00
Sappharad