ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,306 Commits 95 Branches 91 Tags 2.5 GiB
Commit Graph

225 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 44902f4069 nlua doesn't exist in this branch 2018-01-02 16:43:34 +03:00
zeromus 2822e3a270 re-apply "keepalive" GC fixes to luainterface mode in emuhawk; maybe it will actually work now and not result in crashes. at least we should check it. 
Conflicts:
	BizHawk.Client.Common/lua/LuaFile.cs
	BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
 2018-01-02 16:02:20 +03: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 3c7707a6a0 lua - add gui.clearImageCache, also add a param to drawImage that can force it to not be cached if desired 2017-05-29 11:09:19 -05:00
adelikat f81f745fcc Some luaconsole refactoring and moving more logic into LuaImp 2017-05-24 15:59:05 -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 770f27dfd4 Console lua library functions - check if LuaConsole is loaded on these calls. Currently the console should always be open if a script is being called but this is a preparation commit to eventually support running lua scripts without the lua console loaded 2017-05-23 13:05:36 -05:00
adelikat facd845453 Lua Console - Move StartLuaDrawing() and EndLuaDrawing() to LuaImp since they exclusively LuaImp logic 2017-05-23 12:40:40 -05:00
adelikat 6196d81b5d Move _luaList from LuaConsole to LuaImp 2017-05-22 16:47:27 -05:00
adelikat a6414ff05c Mainform cleanup round 2 2017-05-22 14:23:13 -05:00
adelikat 31e68a38f9 Cleanup EmuHawk lua library code 2017-05-19 09:47:18 -05:00
adelikat 7f269d25df Make lua library dependent services private 2017-05-19 08:58:23 -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 e839a1c163 Add lua canvas methods to documentation 2017-05-07 16:33:48 -05:00
zeromus ac767a2acc clarification to the saveram flushing system 2017-05-06 17:50:36 -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 20d2a7d198 Lua - tastudio onquery callbacks - attempt to better clarify the expected lua function that is taken as a parameter 2017-04-30 12:05:27 -05:00
adelikat 1184e8ed05 lua - implement tastudio.getselection(), tastudio.insertframes(), tastudio.deleteframes() 2017-04-22 20:50:03 -05:00
J.D. Purcell b53502eed8 Spaces -> tabs. 2017-04-15 16:37:30 -04:00
adelikat e23dc983f0 Merge pull request #826 from lenalia/master 
Added horizalign and vertalign to DrawText
 2017-04-11 16:43:20 -05:00
lenalia 117ce07aaf Added horizalign and vertalign to DrawText 2017-04-04 21:20:33 -04:00
shanehoman 58e1b52369 expose MainForm.SaveRam() method to lua 2017-04-02 23:12:38 -07: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
feos 853432da26 tastudio lua: add recording mode functions 
finally fixes #793
 2017-03-08 19:56:44 +03:00
adelikat 5d4c8020c2 Delete more stuff 2017-02-22 10:12:14 -06:00
adelikat f35717aae2 Remove yet more unused code 2017-02-22 10:11:08 -06:00
adelikat 7653b86f44 Remove some unused code 2017-02-22 10:09:44 -06:00
Sappharad df2a6c8154 Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/MainForm.cs
 2017-02-21 20:02:00 -06:00
feos b5730bda3a clarify lua doc 2017-02-19 11:56:17 +03:00
zeromus ea2188dc46 make tastudio.setplayback correctly restore the recording flag after it finishes seeking from the greenzone to the target frame 2017-02-07 00:01:14 -06:00
zeromus d87a2b27a2 make lua's new tastudio.setplayback re-enable the record flag if it was set (the existing logic leaves it disabled I think as security against the GUI use case where users might stomp their video seeking while playing in record mode). future work: add lua control for the record mode flag 2017-02-05 04:20:07 -06:00
zeromus 539cdc29f3 add SetPlayback to tastudio lua library. Can't be 100% sure it works, but it seems to be working OK. it may hang everything up if you seek through a really long redzone..... 2017-02-04 21:40:29 -06:00
zeromus a70e6e2fc4 fix #790 (Scroll wheel missing from input.getMouse()) 2017-02-04 20:52:32 -06:00
adelikat 0480ea3f44 when toggling a script on, update on screen lua drawing stuff. On gui.clearGraphics() immediate update the screen 2017-02-04 15:54:04 -06:00
adelikat 0c7cedd2ac lua - tastudio.setmarker() - make marker message optional 2017-02-04 15:11:43 -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
zeromus f7638e8352 "fix" client.bufferwidth and client.bufferheight .... I dont understand why they were doing what they were doing. It seems like such a simple thing, just return the dimensions of the core's videoprovider. Someone should rethink all these (and the surface names, and the padding names) and craft a complete, new design. 2017-01-26 00:54:44 -06:00
Isotarge ab1b1877e8 Lua: Implement forms.setdropdownitems() 2016-12-26 12:13:19 +10:30
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 3bfce81eae LuaConsole - have a RequiredService of IEmulator and pass it into the lua implementation instead of using Global.Emulator 2016-12-06 10:35:11 -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 e99bc9ba41 use the Emulator property instead of Global.Emulator in some lua library files 2016-12-04 12:37:29 -06:00
adelikat b7a6542fb6 Lua - gui.drawImage(), gui.drawImageRegion() - log an error if image can not be found, instead of throwing an exception 2016-11-19 14:10:17 -06:00
Sappharad 07a1709dbb Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/tools/GameShark.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
 2016-10-18 18:23:07 -05:00
adelikat e281950902 Close a lua instance before creating a new one, fixes #455 2016-10-06 15:17:05 -05:00
feos fc66ec1b02 Lua docs: fix #703 2016-09-29 18:09:58 +03:00
Sappharad cb8382a151 Merge branch 'master' into mono-portable 2016-09-01 20:45:39 -05:00