Commit Graph

3449 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
feos d8280551bb and default to gliden again, since it's been fixed for xp
also more jabo option backwards
2018-06-09 02:03:12 +03:00
feos daa4e18372 n64 default to glide64mk2
this is meant to be a WinXPx86 compatible release, but GlideN64 doesn't work there. still default away from jabo :U
2018-06-04 22:11:29 +03:00
feos 595bed1e89 disable Cache Size option in gliden64, but disaplay the value it forces internally 2018-06-02 09:38:37 +03:00
feos 65708ed42d n64: update GlideN64 to 3.0 release
update note in the plugin dialog advertising glide64mk2 to advertize GlideN64 instead
2018-05-28 22:15:53 +03: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 d103838ed3 move avi writer call so it captures lua messages
I think it doesn't outrun anything critical this way
2018-01-03 20:09:20 +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
Sappharad 3226717067 Merge branch '1.x' of https://github.com/TASVideos/BizHawk into mono-portable
# Conflicts:
#	BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
#	BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
#	BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Maria.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-06-25 17:29:23 -05:00
nattthebear 27b6ea6b49 protip: When refactoring, it's not OK to just make it not work. Fixes #873 2017-06-25 09:39:00 -05:00
alyosha-tas 42ddfc0d23 Update MainForm.cs 2017-06-25 09:38:55 -05: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
zeromus 3784be48f9 add 'crop SGB frame' option; fixes #871 2017-06-25 09:38:50 -05:00
alyosha-tas 1c5e1b4b21 Add files via upload 2017-06-25 09:38:48 -05:00
alyosha-tas 0194ba90f9 Create MainForm.cs 2017-06-25 09:38:47 -05:00
alyosha-tas 1f478ab407 Create MainForm.Events.cs 2017-06-25 09:38:46 -05:00
alyosha-tas 491bd5947a Add files via upload 2017-06-25 09:38:46 -05:00
alyosha-tas 29b87731a1 Add files via upload 2017-06-25 09:38:45 -05:00
alyosha-tas 17ce8ab367 Delete temp.txt 2017-06-25 09:38:44 -05:00
alyosha-tas 4ee9460b59 Add files via upload 2017-06-25 09:38:44 -05:00
alyosha-tas 75e778a0e4 Create temp.txt 2017-06-25 09:38:43 -05:00
adelikat 64e9610c99 update statusbar on loadstate slot 7 2017-06-25 09:38:36 -05:00
adelikat 5f956b151a cleanup GenericCoreConfig.cs 2017-06-25 09:38:29 -05:00
adelikat b2902fabfa snes options dialog - hide the "Not supported yet" when hiding the accuracy core option 2017-06-25 09:38:28 -05:00
adelikat ce70247916 Profile config dialog - positioning cleanup 2017-06-25 09:38:20 -05:00
adelikat 55bf697223 Hotkeys for toggling Gameboy 2017-06-25 09:38:18 -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
alyosha-tas 5a44c10a79 Update MainForm.cs 2017-06-16 10:34:35 -04: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
zeromus 6db010e384 add 'crop SGB frame' option; fixes #871 2017-06-11 18:20:55 -05:00
alyosha-tas 5b3c742f0d Add files via upload 2017-06-11 18:31:25 -04:00
alyosha-tas ad1e222cbd Create MainForm.cs 2017-06-11 18:29:12 -04:00
alyosha-tas 05f1b21b61 Create MainForm.Events.cs 2017-06-11 18:25:50 -04:00
alyosha-tas 16163d959e Add files via upload 2017-06-11 18:17:34 -04:00