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

31 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 31e68a38f9 Cleanup EmuHawk lua library code 2017-05-19 09:47:18 -05:00
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -04: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
Isotarge ab1b1877e8 Lua: Implement forms.setdropdownitems() 2016-12-26 12:13:19 +10:30
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 1a123fa491 allow "#aarrggbb" as Color parameter to forms.setproperty. fixes #547 2016-02-08 02:33:58 -06:00
zeromus 5e89e563d0 overhaul lua sandboxing so that each lua script has its own sandbox. elaborate tracking of winform/event ownership to ensure that lua doesnt receive calls without going through the owner's sandbox. add win32-specific speed hacks for currdir set/get at higher speed. There may be bugs in this commit, but I think we're on the right track now. 2016-01-31 19:54:55 -06:00
pjgat09 e4a4a9606c Lua forms: Added a scrollbars argument for creating a textbox. 2016-01-15 21:19:25 -05: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
pjgat09 d54e53d329 Lua forms.setproperty: Convert the passed value to an enum if applicable 2015-12-19 00:01:06 -05:00
Isotarge 02c04d0088 Fix forms.destroyall() and call it when lua console closes 
Fixes #454
 2015-11-07 01:38:44 +10:30
Sappharad 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
adelikat 64126fbad3 issue #469 - lua - forms.newform() - add an onclosed callback optional parameter 2015-08-04 20:17:04 -04: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
pjgat09 57fa633a9e Lua Forms: Fixed a bug with SetProperty 2015-04-05 04:11:00 +00:00
adelikat afdfe11c7e lua - forms.label - add an optional fixedwidth font param 2014-09-07 02:42:44 +00:00
adelikat 0649d1c77e Lua - add some more documentation, add a method that generates tasvideos wiki markup of the documentation and outputs to a file (method not wired to anything, there to save me tons of time when releasing) 2014-06-03 02:19:13 +00:00
adelikat 83ada011e8 Lua - Refactor how lua libraries are registered by searching assemblies and finding implementations and building a list of these 2014-06-01 22:02:59 +00:00
adelikat 17568997bf Lua - unify constructors and have all libraries receive a lua context and an output callback, simplify some convolved registration code 2014-05-21 00:17:35 +00:00
gochaism 0a9039fc60 Set SystemIcons.Application to Lua form icon. 2014-05-02 00:44:14 +00:00
gochaism 3fd9113f0d Disable maximize/resize of Lua forms, since user cannot do anything on resize anyway. 2014-05-02 00:38:48 +00:00
adelikat 33fdf03af6 Lua - fix forms.newForm() 2014-02-23 22:47:45 +00:00
adelikat 7417ea7b8f Lua - more documentation and more strong typing of parameters, more fixups to display of parameter types in the Lua functions list 2014-01-27 03:16:05 +00:00
adelikat 91fdad9d45 LUa - whack now unused code 2014-01-26 16:21:20 +00:00
adelikat 5f9757d7d0 Lua - finish up refactoring remaining lua libraries 2014-01-26 16:15:45 +00:00
adelikat 213e02ffef Lua - forms.textbox() - add a fixed width option 2013-12-30 14:58:09 +00:00
adelikat 91063b7ffd Lua forms library - implement forms.dropdown(), forms.checkbox(), and forms.ischecked(). Add support for dropdowns in forms.gettext() (returns the string value of the selected item) 2013-12-15 02:50:50 +00:00
adelikat 1818e6f5fc Lua - forms.textbox() - add multiline parameter 2013-12-02 03:41:29 +00:00
adelikat 175ed75553 Lua Console - autoscroll the output window as text gets added 2013-11-17 15:55:13 +00:00
adelikat c669680e07 Rename Multiclient folder 2013-11-03 04:05:56 +00:00