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
c8d6ef0628
since Global.AutofireNullControlls was only being used by Mainform, move it there instead of having in Globals
2017-05-22 07:30:34 -05:00
ebe789eed2
heh
2017-05-10 07:45:23 -04:00
59139ab266
Spell out Numerator and Denominator
2017-05-05 11:25:38 -05:00
62a13d961d
Move VsyncNum and VsyncDen out of CoreComm and into IVideoProvider
2017-05-05 11:21:37 -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
698c6741ae
Refactor IEmulator and remove the IController property, instead pass it as a paramter to the FrameAdvance() method
2017-05-01 20:09:11 -05:00
083d9bec0e
Throttle cleanup.
2017-04-30 20:38:10 -04:00
303e8d41e9
Cleanup code to create GUI Renderer.
2017-04-29 17:49:34 -04:00
b53502eed8
Spaces -> tabs.
2017-04-15 16:37:30 -04:00
16bf63ade8
Random cleanups.
2017-04-10 09:36:04 -04:00
45f1a4b64f
Disable MultiHawk's View menu when no ROM is loaded to prevent crash.
2017-04-09 23:23:20 -04:00
676da1002d
Update MultiHawk's DisplayManager. Because I was testing out multiple D3D controls.
2017-04-09 22:44:58 -04:00
93aeffe69e
Remove some duplicate/unused code in MultiHawk.
2017-04-09 21:47:59 -04:00
b63aede96c
Fix MultiHawk build.
2017-04-08 18:34:07 -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
e5f85bbd8f
MultiHawk: Make unreachable code in Mainform ctor reachable again.
...
This corrects a merge error from
0b4fc8b6a520fb060c65
2017-03-04 16:07:36 +01: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
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
25fd0fdb9a
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
BizHawk.Client.EmuHawk/MainForm.cs
BizHawk.Client.EmuHawk/tools/GameShark.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-01-31 21:59:37 -06:00
40be0dd0b3
Refactor the way a Null ControllerDefinition is created
2016-12-16 23:34:18 -06:00
e0d2a88f07
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2016-12-12 20:29:18 -06:00
5ff33e7569
Rename IController.Type to IController.Definition to more clearly describe the property
2016-12-12 12:30:32 -06:00
2fbcaba8f4
Multihawk - pass the Emulator instance into the RecordMovie dialog instead of using Global.Emulator
2016-12-06 10:49:55 -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
5258f9385c
Tastudio - use the Emulator property not Global.Emulator, fix another CoreExension method
2016-12-04 12:30:51 -06:00
17ea38f904
oops
2016-12-04 11:32:34 -06:00
f0e6574def
Similar property in Multihawk
2016-12-04 11:31:07 -06:00
281b83fd40
Remove some usages of VideoProviderGlue in multihawk
2016-12-04 10:17:16 -06:00
0bf5482af4
Fix typo
...
Thanks to Keeta for pointing this out
2016-11-23 00:04:49 +10:30
20fb060c65
make multihawk compile, not sure what happened here, maybe a bad merge?
2016-11-13 11:01:27 -06:00
0b4fc8b6a5
apply Arcade Pit work: "Extract NesCarts.xml for easier modification"
2016-11-12 18:32:18 -06: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
1a1a688b96
remove NeedsToPaint; client now repaints ~100fps while paused all the time. as it already did when input display was enabled. fixes #615.. probably
2016-04-20 12:17:41 -05:00
66683b16ed
replace "Ok" with "OK"
2016-03-26 21:50:33 -05:00
559d029e2c
multihawk: fix missing cfp
2016-03-26 16:38:15 -04: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
2a0e859a85
Add 64 bit build (doesn't work yet), move SlimDX.dll
2016-02-28 15:06:03 -05:00
f96110e09e
crusty old project that couldnt possibly be working now compiles and still doesnt work
2016-02-22 07:17:42 -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
8168031bed
Make TargetZoomFactor a per systemId setting
2016-01-31 21:05:08 -05:00
d786292ccf
remove unused code Apply MOTW code
2016-01-14 01:51:40 -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
1e2f4e12be
Watch refactoring
...
Some improvement when you get Available types. Used to return a new
array each time you call the function. It has been transformed into an
IEnumrable and yield return.
DisplayType, PreviousType and Watchsize have been moved outside the
Watch Class
2015-11-28 22:52:00 +01:00
2895c78be8
Move GLManager from Client.Common to Client.EmuHawk, it is inappropriate to be in Client.Common
2015-10-17 19:27:30 -04:00
7e828d5618
d3d display method
2015-08-24 13:10:50 -05:00
f8b840ea41
fix gdi+ lua rendering and prescale option
2015-07-25 17:29:19 -05:00
Sappharad