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
ebe789eed2
heh
2017-05-10 07:45:23 -04: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
b0141c516e
Multi-disk Bundler: Fix DPI scaling issues and improve control positioning.
2016-12-15 15:06:35 -05: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
b11a76f739
MultidiskBundler - add a RequiredService of IEmulator and use that property instead of Global.Emulator
2016-12-04 12:34:37 -06:00
3cf4d3464d
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/tools/TraceLogger.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2016-08-23 21:21:57 -05:00
a7d2b8d7f7
* add a new IToolForm update mechanism which has extensible update points (so a tool can both pre- and post- update)
...
* make trace logging "core-pushes" model, to a sink installed by the frontend. This sink can go straight to the disk without wasting memory if that's what the Trace Logger tool has selected; or the Trace Logger will buffer it if it needs to. Formerly, we had a "core-pushes-to-buffer" and "client-pulls-once-per-frame" which necessarily caused huge buffers no matter what was going on.
2016-08-13 15:31:26 -05:00
55fb72b6dc
Resolve Error 472 (Don't allow user to add more then 2 GB/GBC ROMs into the Bundler)
2016-06-26 13:44:55 -07: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
234cc2e5d8
Get started on C64 support in the multi-disk bundler
2016-03-04 21:50:24 -05:00
4b38880af7
Added a function to Remove Lines for MultiDiskBundler.
2016-02-27 13:27:31 -08: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
7885934a1e
Add a global tools path in path config, have various tool related paths fallback to this tools folder, wire it up to hex editor .tbl files and basic bot .bot files. Change various tool paths to be . by default to point to the tools folder instead. Add tools folder to version control and builds
2016-02-05 20:46:18 -05: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
283cb4ae50
fix loading of roms from commandline
2015-11-12 17:47:39 -06: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
2373e5bcd5
Support .xml disc bundling for PSX, note: this is sloppy code and mostly copy pasta, sorry.
2015-08-04 17:19:21 -04:00
39bc6cbb8b
Added native file save dialogs on OS X.
2015-07-26 20:14:18 -05:00
7e2cfa0dd5
Multi-Disk bundler - fix various issues with the form, most significantly the wrong system Id for AppleII
2015-06-21 12:51:48 +00:00
7af274c1cc
MultiDiskBundler - don't autofill stuff if the current "rom" is a .xml file
2015-05-17 20:37:19 +00:00
c9f4a27fcd
Multi-Disk bundler - add a system picker, with GB and Apple II as they are currently the only systems that support this
2015-05-17 20:26:25 +00:00
f912103914
Add a tools folder and map paths of things like watch files, debug stuff, etc there rather than defaulting to cluttering up the bizhawk root folder
2015-05-17 17:06:23 +00:00
5f2e2f39b2
MultiDiskBundler - use relative paths when possible
2015-05-10 22:17:00 +00:00
c80fb97bc9
MultiDiskBundler - fix exception on load when the current rom is in an archive
2015-05-10 20:04:27 +00:00
ea72da9f89
Refector xml game, it now has a List of keyvalue pairs instead of dictionary, and the schema is now LoadAssets with an array of Asset tags. MultiDiskBundler changes to account for this, also remove restriction of using current rom based on system type, isntead it will assume any system is ok
2015-05-10 18:58:00 +00:00
99e3c688bc
progress on MultiDiskBundler
2015-05-09 13:05:19 +00:00
d604c89de5
MultiDiskBundler - progress
2015-04-23 01:41:56 +00:00
732bc5389c
progress on MultiDiskBundler
2015-04-19 22:34:08 +00:00
64c588ea5a
start the MultiDiskBundler tool, that will make it easy to make multi-game xml files such as for Apple II and dual gameboy (and eventually other systems)
2015-04-19 21:02:22 +00:00
Sappharad