Commit Graph

36 Commits

Author SHA1 Message Date
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 078dc4ddb1 misc cleanups in remaining config files 2017-05-31 10:28:06 -05: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 ebe001b526 Cleanup FirmwareManager, and some other Emulation.Common nitpicks 2017-04-27 10:55:22 -05:00
Sappharad 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
adelikat eba11b259e HawkFile - fix exception when a file has no extension, and also simplify the logic 2016-12-06 12:21:05 -06:00
Sappharad 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
zeromus 1e928c6b17 add sha1: label to hashes in firmwares config info sub-window 2016-01-31 16:39:54 -06:00
Sappharad 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
zeromus 529ec876a2 firmwares config - escape should exit dialog 2015-10-15 19:47:38 -05:00
Sappharad 74d7bf32b6 Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	Version/version.csproj
2015-07-15 21:42:53 -05:00
scrimpeh 7b25254b72 Firmware Manager - Change wording to "Close and reload ROM" instead of "Close and load ROM", add tool tip displaying ROM path. 2015-07-15 08:31:03 +02:00
scrimpeh 667e4273f3 Firmware Manager - Add option to reload ROM if ROM load has failed before 2015-07-12 21:30:26 +02:00
zeromus 283de943d7 dont fail importing firmwares when target directory doesnt exist 2015-07-11 14:06:28 -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 f4140de3f7 Apple II - get necessary firmware files from the firmwares system instead of a hardcoded path, added entries to the firmware database for the files I have, no idea what other files are compatible 2015-04-09 00:18:01 +00:00
goyuken f2ff432b3a helpful mouseover tooltips in firmwares config 2014-12-04 00:37:06 +00:00
adelikat d64be5ed76 SystemID is Lynx not LYNX, cuz I said so 2014-11-21 01:32:15 +00:00
zeromus a7432a1e52 firmwaremanager now tracks filesizes, and filesizes of known firmwares are used to restrict scope of scanning 2014-11-13 00:09:16 +00:00
zeromus 4d5b25600e add a GC.Collect() call to workaround a .net slow-GC problem, and fix an old bug related to firmware scans occurring several times actually every time you think it should happen once, which probably wasn't helping things 2014-11-12 00:04:08 +00:00
zeromus 5cf5894329 firmware importer now supports archives 2014-10-26 14:22:26 +00:00
zeromus 2f374d9199 add firmware import option (copies firmwares into firmware directory through toolbar or drag&drop) 2014-10-26 04:23:56 +00:00
goyuken 28a37a57da lynx mah boi https://www.youtube.com/watch?v=bNpLXo55yfw 2014-09-15 20:12:11 +00:00
zeromus d5c4787792 dont crash when organizing firmware 2014-08-03 22:38:27 +00:00
adelikat 0397ea1ff4 Remove the CustomControls/Util file and move all the classes into the Form Extensions file, since they were all extension methods for window form objects 2014-07-27 15:22:30 +00:00
adelikat 5f1df3224c fix some dangling references to BizHawk.Multiclient mostly in comments, but also in some client facing tooltip and lua documentation 2014-07-27 01:19:33 +00:00
adelikat ab5cfab035 remove redundant code throughout the emuhawk project 2014-06-29 02:28:48 +00:00
zeromus f43859f421 give firmware database and UI ability to track ok/notok/bad state of an option/firmwarefile. apply tons of research to study PSX bios files situation 2014-06-21 06:40:07 +00:00
zeromus 3cdc9d7c25 add friendly name PSX to frontend 2014-06-21 00:48:31 +00:00
beirich 197ca96630 preliminary add SMS bios to firmwares db and UI. not hooked up to core yet. nor all bioses added 2014-03-04 02:33:39 +00:00
zeromus 76d867d5da add the coveted combo breaker 2013-12-19 22:53:06 +00:00
zeromus 5a8afc0411 firmware config dialog: add perks and fix bugs 2013-12-19 16:59:23 +00:00
goyuken 85be43dfb8 sega CD games now get as far as loading the bios 2013-12-16 19:00:05 +00:00
zeromus 483cf96853 rename PathEntries.WatchPath etc. to PathEntries.WatchPathFragment to better convey the idea that it isnt a fully-qualified path, so its less likely to get used on accident 2013-12-13 05:20:50 +00:00
adelikat 348171bdc5 start Emulation.Common project and move the Emulation/Database folder files to it 2013-11-04 01:06:36 +00:00
adelikat c669680e07 Rename Multiclient folder 2013-11-03 04:05:56 +00:00