Commit Graph

39 Commits

Author SHA1 Message Date
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 027a150c02 Add files via upload 2017-06-11 18:30:38 -04: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
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -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
J.D. Purcell ed3bf0e62b Fix mixed line endings. 2017-04-15 15:53:02 -04:00
Sappharad df2a6c8154 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.cs
2017-02-21 20:02:00 -06:00
zeromus 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
Sappharad 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
adelikat 2d9213c379 IController - Remove the indexer property and refactor code accordingly, also simplify and cleanup many of the IController implementations 2016-12-14 14:12:16 -06: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 5ff33e7569 Rename IController.Type to IController.Definition to more clearly describe the property 2016-12-12 12:30:32 -06:00
Sappharad 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
Ben Eirich 52008a9a5d Not crashing on PCE-CD is good too 2016-06-25 20:38:47 -04:00
Ben Eirich 20300834da Don't crash when loading SGX games =( 2016-06-25 20:24:00 -04:00
Sappharad 849498dfa6 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/Program.cs
2016-06-21 20:48:49 -05:00
Hathor86 7fb0eaf337 Add Save/Load state methods and events to ApiHawk
Now, ApiHawk can save and load name state. There are also events that
you can attached too. Furthermore, BeforeQuickSave/BeforeQuickLoad
events occurs just after user pressed button. We can react to this and
even override behavior.
Finally, I just allow .bat to take xml files (for ApiHawk doc)

PS: Yeah, I'm still alive
2016-05-29 16:50:16 +02:00
Sappharad a821936f1d Migrated Mac wrapper to Xamarin Studio Community instead of MonoMac, now that it's free. 2016-05-10 21:06:03 -05:00
Sappharad 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
Hathor86 8cd88cdeca ApiHawk - Add few other system inputs
SNES, SMS, Genesis, N64, GB
Following some tests, it works (so I'd say that this feature is beta)
2016-04-06 22:11:00 +02:00
Hathor86 fbad1ccec0 Get / set inputs Api improvement 2016-04-03 18:17:22 +02:00
Hathor86 fcb0c8bc32 Work on input get/set through ApiHawk
Convertion has been moved to dedicated class

SystemInfo class review

SystemInfo class now instanciate all SystemInfo and stores them in a
static readonly collection (avoid creating a new class each time we call
DisplayName property).
+ EmulatedSystem enum (in Api) renamed to CoreSystem and moved to
BizHawk.Client.Common
+ this enum is used in SystemInfo class

Created a Joypad class that is populated with JoypadButton enum flags

Input get/set throught ApiHawk works for NES only. So many work remains...
2016-03-29 23:42:24 +02:00
Hathor86 f42c0d4a39 DoFrameAdvance method in ApiHawk 2016-03-23 23:05:15 +01:00
Hathor86 9a05512a48 EmulatedSystem enum for ApiHawk
Created an enum (and a convertion function) for emulated system. It
provides a more sexy way to work with SystemID.
It also means that convertion function and enum has to be updated if we
add a new system.
2016-03-20 23:05:38 +01:00
Hathor86 c0f7219b06 Contextualization of external tools + Basic of ClientApi
We can now specify a context for external tools. Global, specific for a
type of emulator / system or specific for a game (If not specified, a
tool is global).  It should avoid loading something unwanted.

Also add ClientApi, a static class that can interract with EmuHawk
window (SetPadding is the only thing implemented currently).
2016-03-16 23:06:53 +01:00
Sappharad 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
nattthebear 2a0e859a85 Add 64 bit build (doesn't work yet), move SlimDX.dll 2016-02-28 15:06:03 -05: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 a990e3a2f2 toolsversion 14.0 NOT 2016-01-30 18:39:04 -06:00
zeromus bf93d816e1 why does my visual studio keep changing the newlines in here 2016-01-14 01:50:54 -06:00
Hathor86 2876f63dd8 ExternalTools: Allow several tools running simultaneously 2015-12-30 11:00:56 +01:00
Hathor86 da25052e09 Just few comments on above notwa's method :)
(Oh and transform string concatenation with + to a string.Format)
Also made a small fix to externaltoolmanager
2015-12-24 14:00:08 +01:00
Hathor86 1d10565992 Bug fix: Crash if ExternalTool directory does not exists
As mentionned, this bug is fixed, it creates the directory if it does
not exists
+ ExternalTool code exemple is cloned from repo and added inot
ExternalTool folder
2015-12-20 18:13:54 +01:00
Hathor86 a7074c6341 ExternalToolManager and BizHawkExternalToolattribute
Add those 2 classes in order to help handling of external tools
- Also fix value setting in watches constructor
- Bugfix in loading externaltools (they loaded multiple times)
- Add new version of Hello World external tool
Whitespaces noise in RamWatch.cs... :s The code hasn't changed
2015-12-13 21:38:35 +01:00
Hathor86 708bb4fa93 Final stuff to WatchList
Now fully use comparer class. That saves memory and offer extensibility
ItemCount property obsolete => Moved to Count property (which did the same thing)
Moved ConfigPersistAttribute.cs, IToolForm.cs, IToolFormAutoConfig.cs back to common
2015-12-09 00:54:54 +01:00
Hathor86 31cc08a954 More WatchList comments
Finished coments on WatchList object
2015-12-02 22:48:30 +01:00
Hathor86 01639c3e10 Watch comparaison interfaces implementation
Watch now implements IEquatable<Watch>, IEquatable<Cheat>,
IComparable<Watch>
Operators had also been overloaded. You can now put watches from SAME
domain in a list and easly sort them.
Sorting is based on address first then size.
2015-11-29 13:46:50 +01:00
Hathor86 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
Hathor86 d4b4c06f0c Draft of API
So, I create a new dll named BizHawk.Client.ApiHawk and moved few stuff
to it.
Also moved some stuff to BizHawk.Client.Common. Don't think it can be
desiociated.

I started comment Watch and rearrange code (put some #region etc...

It compiles and it seems working :)
2015-11-26 23:05:29 +01:00