Sappharad
5cbd34b41f
Corrected a build error caused in the merge.
2019-10-06 18:42:19 -05:00
Sappharad
ee84e5981c
Merge remote-tracking branch 'origin/1.x' into mono-portable
...
# Conflicts:
# BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
# libmupen64plus/mupen64plus-win32-deps
# libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2019-10-03 21:33:28 -05:00
feos
51b2843fed
bsnes: send vcounter and hcounter among registers
2018-04-23 21:04:46 +03:00
Sappharad
3226717067
Merge branch '1.x' of https://github.com/TASVideos/BizHawk into mono-portable
...
# Conflicts:
# BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
# BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
# BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Maria.cs
# BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
# BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
# BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-06-25 17:29:23 -05:00
alyosha-tas
9849d124fe
SNES saveram: check for existance
...
checks if SGB saveram exists before attempting to assign it to the buffer pointer.
Also return null if no saveram is found, which conforms to what other cores are doing and what EMUHawk expects
2017-06-25 09:38:54 -05:00
zeromus
3784be48f9
add 'crop SGB frame' option; fixes #871
2017-06-25 09:38:50 -05:00
Sappharad
71e34339a3
Merge branch 'master' into mono-portable
...
# Conflicts:
# BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
# BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-06-16 22:57:52 -05:00
alyosha-tas
5b731cf8b8
SNES saveram: check for existance
...
checks if SGB saveram exists before attempting to assign it to the buffer pointer.
Also return null if no saveram is found, which conforms to what other cores are doing and what EMUHawk expects
2017-06-16 08:50:28 -04:00
zeromus
6db010e384
add 'crop SGB frame' option; fixes #871
2017-06-11 18:20:55 -05:00
Sappharad
464bba9454
Merge branch 'master' into mono-portable
...
# Conflicts:
# BizHawk.Client.EmuHawk/MainForm.Events.cs
# BizHawk.Client.EmuHawk/Properties/Resources.resx
# BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs
# BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-06-04 19:31:56 -05:00
adelikat
5f1b8cdc09
SNES - fix frame 0 loadstating
2017-05-27 10:21:14 -05:00
adelikat
12a4ec1ac7
SNES - only register the trace logger on compatibility profile
2017-05-27 09:54:53 -05:00
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
zeromus
5b44f0960f
snes: support trace logging GB and SMP cores (C# side and dlls)
2017-05-14 13:51:02 -05:00
nattthebear
ebe789eed2
heh
2017-05-10 07:45:23 -04:00
zeromus
c641e163f9
SGB CDL c# side; and fix SGB loading (broken by pwrap refactors)
2017-05-06 16:23:26 -05:00
adelikat
1dae91e6a8
clean up core constructors - consistent parameter casing, and put them at the top of the class
2017-05-05 19:05:36 -05:00
adelikat
59139ab266
Spell out Numerator and Denominator
2017-05-05 11:25:38 -05:00
adelikat
62a13d961d
Move VsyncNum and VsyncDen out of CoreComm and into IVideoProvider
2017-05-05 11:21:37 -05:00
J.D. Purcell
1946db8791
Whitespace, to reduce difference with master.
2017-05-02 23:12:37 -04:00
J.D. Purcell
8b2b12585a
Mostly whitespace cleanup to reduce difference with mono-portable branch.
2017-05-02 23:09:50 -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
nattthebear
e3fab1a4d5
cleaner
2017-05-02 18:15:33 -04:00
adelikat
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
adelikat
ded1c2d7b7
Break off BoardName from IEmulator into a separate IBoardInfo service
2017-04-30 21:01:54 -05:00
adelikat
3192cc70ae
slight refactor to IEmulator - make the IController property set only to more clearly express the client -> core relationship
2017-04-26 19:09:00 -05:00
adelikat
2de20e956b
use Dictionary initializers instead of object initializers for various GetCpuFlagsAndRegisters() methods
2017-04-25 08:28:06 -05:00
nattthebear
5bebd0685a
snes: add a toggle multitap button
2017-04-22 17:08:33 -04:00
adelikat
d14b2abd17
Revert "now no one gets to have any fun"
...
This reverts commit e199dfda0d
.
2017-04-22 15:14:20 -05:00
nattthebear
e199dfda0d
now no one gets to have any fun
2017-04-22 16:04:39 -04:00
nattthebear
12b4be4fbc
justifier
2017-04-22 10:41:45 -04:00
adelikat
242b0e09ab
SNES - support the Justifier, because why not
2017-04-22 08:55:39 -05:00
adelikat
62ed1b5b73
snes - change x,y button names to something less vauge
2017-04-20 21:05:11 -05:00
nattthebear
a46acca981
It's like archaeology. We're the first ones to use this ancient Mayan super scope code
2017-04-20 21:29:58 -04:00
adelikat
99d70a1c7f
SNES - super scope support
2017-04-20 19:50:58 -05:00
adelikat
27e7edcaf1
SNES - add a "Limit mouse speed" options on by default, to make controls a sueable for casual playing and a config option to turn it off
2017-04-19 20:30:54 -05:00
J.D. Purcell
3d6b1da94d
Whitespace only (indentation fixes/cleanup).
2017-04-19 20:34:30 -04:00
adelikat
3f866f6d7f
Rename SnesSaveController to SaveController and move it to Emulation.Common since it is used by multiple cores and is general in design
2017-04-19 12:44:02 -05:00
adelikat
ee5d35bb34
Libsnescore reformat round 3
2017-04-19 12:33:05 -05:00
adelikat
58189f0113
LibsnesCore - Move ScanlineHookManager class to its own file
2017-04-19 12:25:22 -05:00
adelikat
e3ae4b1410
LibsnesCore reformating round 2 - sort out private fields vs pulbic properties
2017-04-19 12:19:16 -05:00
adelikat
808d03155a
Libsnescore - misc cleanups round 1
2017-04-19 11:40:41 -05:00
adelikat
7ebddc6087
LibsnesCore - break off memory domain stuff to a separate file
2017-04-19 10:51:16 -05:00
adelikat
bc42af0fa6
Libsnescore - Break off IEmulator implementation into a separate file
2017-04-19 10:36:08 -05:00
adelikat
8e3c3dab5d
Break off LibsnesCore services into separate files
2017-04-19 09:41:52 -05:00
adelikat
d1d6c20749
break SNES settings code into its own file
2017-04-19 08:31:48 -05:00
zeromus
f108673449
fix some embarrassing bugs in new snes interop. maybe biz will be more stable now.
2017-04-18 22:09:04 -05:00
zeromus
2e286317f2
tidy snes
2017-04-17 22:49:17 -05:00
adelikat
18017b5e23
SNES - better mouse button names
2017-04-17 16:32:09 -05:00
nattthebear
0393e9241b
coreside, this is a short, so yeah...
2017-04-16 18:08:57 -04:00