Commit Graph

629 Commits

Author SHA1 Message Date
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
vadosnaprimer fca08b66a4 lua: client.isturbo() and client.isseeking() 2018-01-07 16:10:01 +03:00
vadosnaprimer d103838ed3 move avi writer call so it captures lua messages
I think it doesn't outrun anything critical this way
2018-01-03 20:09:20 +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
nattthebear 27b6ea6b49 protip: When refactoring, it's not OK to just make it not work. Fixes #873 2017-06-25 09:39:00 -05:00
alyosha-tas 42ddfc0d23 Update MainForm.cs 2017-06-25 09:38:55 -05:00
alyosha-tas 0194ba90f9 Create MainForm.cs 2017-06-25 09:38:47 -05:00
alyosha-tas 491bd5947a Add files via upload 2017-06-25 09:38:46 -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 5a44c10a79 Update MainForm.cs 2017-06-16 10:34:35 -04:00
alyosha-tas ad1e222cbd Create MainForm.cs 2017-06-11 18:29:12 -04:00
alyosha-tas 16163d959e Add files via upload 2017-06-11 18:17:34 -04: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 cd7e6f4f67 add c64 file extensions to open file dialog for release builds 2017-06-03 14:20:12 -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
adelikat fd1338a46f Mainform - restore Autohawk click event, remove some unused methods 2017-05-22 14:23:13 -05:00
adelikat a6414ff05c Mainform cleanup round 2 2017-05-22 14:23:13 -05:00
adelikat 0796c14046 Misc mainform cleanups 2017-05-22 14:23:13 -05:00
adelikat 8062faf40b organize mainform menu item event methods 2017-05-22 09:04:47 -05:00
adelikat 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
adelikat f093ad8606 C64 - multi-disk support 2017-05-15 19:52:05 -05:00
adelikat 120f70b83b When key priority is Hotkey over input, account for hotkeys that are not handled through the CheckHotkey() method 2017-05-15 13:11:18 -05:00
adelikat 58500fef0c Add Toggle Key Priority hotkey 2017-05-14 13:53:44 -05:00
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -04:00
J.D. Purcell e72aa11d5d Fix rewind crash when cancelling out of archive file picker dialog. 2017-05-08 22:50:45 -04:00
zeromus ac767a2acc clarification to the saveram flushing system 2017-05-06 17:50:36 -05:00
alyosha-tas 03f5403b71 Check if save ram exists before writing it 2017-05-06 18:42:09 -04: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
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 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
J.D. Purcell 083d9bec0e Throttle cleanup. 2017-04-30 20:38:10 -04:00
J.D. Purcell 0d853fd74a MainForm cleanups. 2017-04-29 15:18:08 -04:00
J.D. Purcell 3ebcaa8af0 Rewind cleanup / tweaks. 2017-04-29 14:04:19 -04:00
J.D. Purcell a72bdfe30f Allow rewind during movies. 2017-04-29 11:06:00 -04:00
J.D. Purcell 4848bb5cc3 MainForm: Remove unused line. 2017-04-24 10:34:13 -04:00
adelikat 13ca76f3f8 UI for changing SNES controller configurations 2017-04-15 20:34:32 -05:00
J.D. Purcell 16bf63ade8 Random cleanups. 2017-04-10 09:36:04 -04:00
shanehoman 58e1b52369 expose MainForm.SaveRam() method to lua 2017-04-02 23:12:38 -07:00
J.D. Purcell 07a8c2c027 Remove unnecessary rewind capture on ROM load. I reviewed the original commit where it was added, and it was only to initialize the delta rewind buffer. 2017-04-02 23:01:41 -04:00
Sappharad d68d961ef8 Merge branch 'master' into mono-portable 2017-04-02 20:03:31 -05:00
J.D. Purcell 3f776dbf6f Rewind: Fix subtle off-by-one-frame bugs (only really noticeable when frame advancing). 2017-04-02 18:50:34 -04:00
J.D. Purcell c58d2929f8 SoundOutputProvider: Standalone mode to eliminate the need for an external buffer when used with SyncToAsyncProvider. 2017-03-25 16:26:46 -04:00
J.D. Purcell 231795c2cb Correction to previous AVI recording commit: buffer doesn't need to be so large. 2017-03-23 09:30:22 -04:00
J.D. Purcell 33d42152a8 Fix N64 audio weirdness in AVI recording. 2017-03-22 23:00:37 -04:00
J.D. Purcell 6cc5a914b7 Rewind cleanup. 2017-03-18 21:22:02 -04:00
zeromus edc3cea302 use gizmo to load roms from drag&drop and commandline (file>open already magically worked, due to explorer I guess) 2017-03-15 22:50:35 -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