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
49239b7a83
tastudio: supposedly fix #1090 question mark
2018-01-10 22:49:02 +03:00
vadosnaprimer
fc12f490fe
tastudio: MarkerView.ShrinkSelection()
2018-01-10 22:49:02 +03:00
vadosnaprimer
111d269dcc
tastudio:
...
- scroll to new marker and new branch
- don't kill selection per marker removal
2018-01-10 22:49:01 +03:00
zeromus
ba1731fe51
in 1809d19ecb
@vadosnaprimer made the disk capacity for greenzone disabled, but for some reason old settings files may still be setting a value into it, or maybe old tasprojs or something, so I just put a big limit on it so things dont crash. /shrugs
2018-01-10 22:49:00 +03:00
vadosnaprimer
fca08b66a4
lua: client.isturbo() and client.isseeking()
2018-01-07 16:10:01 +03:00
adelikat
861828dc85
TAStudio - remove ability to edit the platform id when editing the header
2018-01-04 14:56:44 +03:00
adelikat
9ff5dc6f73
Tastudio - fix recent menu - fixes #920
2018-01-04 14:56:42 +03:00
vadosnaprimer
44902f4069
nlua doesn't exist in this branch
2018-01-02 16:43:34 +03:00
vadosnaprimer
13741a23c0
use actual Clamp()
2018-01-02 16:07:10 +03:00
vadosnaprimer
7896664a15
fix #1072
...
thanks for helping, .net
2018-01-02 16:07:10 +03:00
vadosnaprimer
8e9b5afbd9
smart state gap for greenzone. fix #915
...
disable disk capacity setting
2018-01-02 16:07:09 +03:00
vadosnaprimer
103fb343ce
tastudio: drop logic that shrinks branch screenshot popup
...
the fact that it was screwing up osd text (that's not pixel based by design) causes more problems than smaller popup was ever intended to solve. and it's not branch or tasproject size, because screenshots are stored in the same resolution as your emulator screen. so I don't even know which problems it was solving. if it was made to shrink because originally it couldn't expand outside tastudio, this has been resolved a while ago, and we can afford covering as much user screen as they already cover with emuhawk. unless they complain, then it can return as an option.
2018-01-02 16:07:08 +03:00
feos
160eed764e
tastudio: don't trigger right button up events if left button is still held down
2018-01-02 16:05:49 +03:00
feos
894d9ba11a
tastudio: unbreak things if user cancels movie conversion on file open
2018-01-02 16:05:48 +03:00
feos
ec7cc54131
tastudio: do normal seeking while recording too. needs testing
...
if you go to a frame while recording and unpaused, it will seek to that frame (not touching input since rec mode is suspended), and after it reaches it, it will unpause and restore rec mode
2018-01-02 16:05:47 +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
zeromus
46109c29a7
add LuaCanvas DrawArc missing from last luacanvas PR merge
2017-06-25 09:38:53 -05:00
Trivial-Man
42763c00d7
Add drawing features
...
Brings canvas up to feature parity with LuaLibraryBase
2017-06-25 09:38:53 -05:00
alyosha-tas
29b87731a1
Add files via upload
2017-06-25 09:38:45 -05:00
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
zeromus
4e1decfa21
add LuaCanvas DrawArc missing from last luacanvas PR merge
2017-06-15 15:01:50 -05:00
Trivial-Man
eff9308bbf
Add drawing features
...
Brings canvas up to feature parity with LuaLibraryBase
2017-06-15 11:41:27 -06:00
alyosha-tas
3c46604f28
Add files via upload
2017-06-11 18:15:11 -04: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
1164868063
GB config dialogs cleanup
2017-05-31 08:52:55 -05:00
feos
3ba4adb6bc
tastudio: finish moving column click edits to taseditor logic
2017-05-29 20:20:44 +03: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
4db328f7ad
Hex Editor - Find box - remember Hex vs Text radio selection
2017-05-28 10:13:34 -05:00
adelikat
f81f745fcc
Some luaconsole refactoring and moving more logic into LuaImp
2017-05-24 15:59:05 -05:00
adelikat
19dde8018a
InputRoll cleanups
2017-05-24 11:45:57 -05:00
adelikat
74b2cca967
more tastudio cleanups
2017-05-24 10:50:25 -05:00
adelikat
b03e224c5e
TAStudio cleanup
2017-05-24 10:49:35 -05:00
adelikat
50b5f4a1a9
Virtualpad misc cleanups
2017-05-24 09:07:03 -05:00
adelikat
47f2371953
Misc cleanups
2017-05-24 09:06:31 -05:00
adelikat
4d1dd215e6
Lua Console - temp fix to fix recent regression of lua scripts disappearing on reboot core
2017-05-24 08:30:30 -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
4919fc5182
don't reference GlobalWin.LuaConsole in LuaConsole!
2017-05-23 13:04:28 -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
8d91557f4e
cleanups in ToolManager
2017-05-22 14:23:14 -05:00
adelikat
a6414ff05c
Mainform cleanup round 2
2017-05-22 14:23:13 -05:00
adelikat
f89bcf4bfa
cleanup of Lua some related files
2017-05-19 11:05:21 -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
adelikat
0d4313af91
general Cheat code cleanup
2017-05-18 15:16:02 -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
a9ba93fcf3
C64 virtual pad - fixing mapping of joypad B buttons
2017-05-13 16:45:18 -05:00