Commit Graph

265 Commits

Author SHA1 Message Date
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 43cb50d5c3 Misc cleanups in Client.Common 2017-05-19 13:17:07 -05:00
adelikat 7f269d25df Make lua library dependent services private 2017-05-19 08:58:23 -05:00
adelikat 75affd8940 Lua console code cleanup 2017-05-18 14:53:03 -05:00
adelikat 4c48542b98 fix null reference exception when LuaSandbox attempts to use the Logger 2017-05-18 14:27:22 -05:00
adelikat 70baf9d306 Client.Common cleanups 2017-05-18 11:36:38 -05:00
adelikat 2a54517b52 more misc Client.Common cleanups 2017-05-17 13:18:26 -05:00
adelikat dfea029fe4 Misc cleanups in Client.Common, documentation fixes 2017-05-17 11:16:55 -05:00
adelikat 91fb593ea1 lua - implement emu.getboardname() 2017-05-12 15:18:43 -05:00
adelikat 429b066955 Client.Common - remove various redundant codez 2017-05-10 13:37:04 -05:00
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -04:00
zeromus 8bc067cbbe lua: fix memory leak causing crash after a few dozen script loads/resets 2017-05-10 01:58:19 -05:00
adelikat e0985465b6 misc Client.Common code cleanups 2017-05-09 13:19:55 -05:00
adelikat e839a1c163 Add lua canvas methods to documentation 2017-05-07 16:33:48 -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
adelikat ded1c2d7b7 Break off BoardName from IEmulator into a separate IBoardInfo service 2017-04-30 21:01:54 -05:00
J.D. Purcell b53502eed8 Spaces -> tabs. 2017-04-15 16:37:30 -04:00
adelikat b6f335e4c8 misc code cleanups in BizHawk.Client.Common 2017-04-14 14:59:01 -05:00
adelikat fc59710dab some code cleanup, mostly introducing C#6isms, also add a customized resharper+stylecop settings file in case anyone is using resharper 2017-04-10 10:30:05 -05:00
Sappharad df2a6c8154 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.cs
2017-02-21 20:02:00 -06:00
adelikat 6ae8a88658 remove some debugging junko 2017-02-11 13:41:25 -06:00
adelikat 86c74305e4 lua console - when toggling a script on, behave the same as if you loaded it. It should run immediately, not on the next frame 2017-02-03 16:31:38 -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 ab1a22bf31 add TotalExecutedCycles as an IDebuggable property, and implement it in cores with the information readily available (and throw NotImplementedExecptions in the remaining). wire the property up to lua with emu.totalexecutedcycles(). Stil todo - wire it up to the Debugger gui 2017-01-09 19:23:05 -06:00
adelikat 2059558771 Lua - fix emu.getdisplaytype() that has been broken for a long time, also fix it to properly use the IEmulatorService system instead of reflection shenanigans 2016-12-15 13:09:52 -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
adelikat e94de78ebd Lua - fix movie.getinput() to return float values instead of passing "False" no matter what 2016-12-14 13:22:01 -06:00
adelikat 72a59087b5 Use the IController indexing property less in preparation for removing it from the interface. Replaced with its more explicity counter-part .IsPressed() 2016-12-14 12:42:15 -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 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
adelikat 44fa93e15f Lua - make the MemorySavestate library dependent on IStatable 2016-12-04 12:08:21 -06:00
adelikat 63202570cc Lua NES library - properly use an OptionalService instead of Global.Emulator 2016-12-04 11:50:07 -06:00
adelikat 7bff28bdee Lua - memory library - actually default to system bus, previous commit was unsufficient 2016-11-12 11:55:20 -06:00
adelikat bf9956089d Lua - default the memory library to system bus (if available) 2016-11-12 09:25:18 -06:00
adelikat 045f5e9df1 Lua documentation - clean up return values to match conventions in parameters 2016-11-11 11:40:53 -06:00
adelikat b0552224e0 Lua documentation - fix notation for nullable bools 2016-11-11 11:30:18 -06:00
adelikat fa6cb75a77 When generating wiki documentation, add some info about parameter types, #401 2016-11-11 11:27:06 -06:00
Sappharad cb8382a151 Merge branch 'master' into mono-portable 2016-09-01 20:45:39 -05:00
feos 91a29a8692 n64: yet another dynarec check, this time for lua 2016-08-25 22:11:53 +03: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
parasyte 71c7edbb24 Add address mask setting for breakpoints 2016-08-08 04:37:39 -07: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
nattthebear 111648cf98 Break a bunch of memory domain stuff with pointless refactoring 2016-04-13 19:50:06 -04:00
zeromus 5024f6022e console log lua exceptions, workaround for #607 2016-03-31 14:11:34 -05:00
feos a6c3561db0 lua: movie.getinput() now fails gracefully if adapter is null.
fixes #595
movie.mode() returns a string, so make its modes look like strings in the description.
2016-03-12 12:05:24 +03:00
zeromus aa3c599882 readd y=x functionality to SetReadOnly 2016-03-10 19:03:07 -06: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