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
8e9b5afbd9
smart state gap for greenzone. fix #915
...
disable disk capacity setting
2018-01-02 16:07:09 +03:00
vadosnaprimer
fbe8a706d4
tastudio: why don't we update input every new frame we capture
...
everybody loves tiny off by one errors that completely break everything
2018-01-02 16:07:07 +03:00
feos
870d4e778e
tastudio: always assign branch's laglog when it's loaded
...
fixes failure to color greenzone if a branch without input diff was loaded (and some other weird conditions were met)
2018-01-02 16:05:48 +03:00
adelikat
46e9c8141d
C64 - FIx mnemonics for previous and next disk buttons
2017-06-25 09:38:16 -05: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
617bc16079
C64 - FIx mnemonics for previous and next disk buttons
2017-06-04 11:27:36 -05:00
feos
2e519eda05
tastudio: fix marker copies being recorded to history when branch backup is created
2017-05-29 21:20:46 +03:00
feos
c1ee1d9505
tastudio: fix stupid bug in SetBoolStates()
2017-05-29 20:20:46 +03:00
adelikat
8de4e7bff9
add ui to switch to Atari7800Hawk, still not useable by humans, needs gamedb stuff
2017-05-27 08:56:25 -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
43cb50d5c3
Misc cleanups in Client.Common
2017-05-19 13:17:07 -05:00
adelikat
e0e5eaea44
Movie Session - fix logic with remembering mGBA vs VBA, also some other misc cleanups and add some documentation
2017-05-19 08:36:52 -05:00
adelikat
70baf9d306
Client.Common cleanups
2017-05-18 11:36:38 -05:00
adelikat
85f78b358d
IMovie - remove the unused GetInputLog() property and also from implementing classes. I guess savestate code that was using it got refactored at some point making it unused.
2017-05-17 13:26:14 -05:00
adelikat
cf15eb8950
TasStateManager - deciding upon a "fix" to the probable bug. This is technically different behavior than before but the intended behavior? This might break stuff
2017-05-17 13:20:57 -05:00
adelikat
2a54517b52
more misc Client.Common cleanups
2017-05-17 13:18:26 -05:00
adelikat
e930dd3326
some bk2 code cleanup
2017-05-17 11:53:42 -05:00
adelikat
dfea029fe4
Misc cleanups in Client.Common, documentation fixes
2017-05-17 11:16:55 -05:00
adelikat
22e2df3868
Point out a probable bug
2017-05-10 14:26:21 -05:00
adelikat
29d470a933
Cleanup tasproj related code. This includes C#6ism (feos has 2015 now). Added some todos for some sketch code
2017-05-10 14:19:46 -05:00
adelikat
adc60dc6fb
more LINQ pet peeves
2017-05-10 13:43:41 -05:00
adelikat
3860cf89c3
LINQ-fu
2017-05-10 13:40:18 -05:00
adelikat
429b066955
Client.Common - remove various redundant codez
2017-05-10 13:37:04 -05:00
adelikat
f942a409d7
Client.Common - remove a bunch of unused usings
2017-05-10 13:27:10 -05:00
nattthebear
ebe789eed2
heh
2017-05-10 07:45:23 -04:00
adelikat
e0985465b6
misc Client.Common code cleanups
2017-05-09 13:19:55 -05:00
adelikat
eafa39456f
Genesis - there's a couple more buttons on the menacer
2017-05-07 18:05:09 -05:00
adelikat
cb24ed1d22
some mnemonics for colecovision peripheral buttons
2017-05-06 19:08:57 -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
ded1c2d7b7
Break off BoardName from IEmulator into a separate IBoardInfo service
2017-04-30 21:01:54 -05:00
adelikat
26d8166c0e
mnemonic for SNES multitap toggle button
2017-04-30 12:30:43 -05:00
adelikat
5a408f9321
Remove the obsolete BinaryStateLoader.HasLump()
2017-04-24 13:18:45 -05:00
adelikat
1184e8ed05
lua - implement tastudio.getselection(), tastudio.insertframes(), tastudio.deleteframes()
2017-04-22 20:50:03 -05:00
adelikat
3889703bf9
snes - mnemonics for payload controller, meh
2017-04-22 12:41:35 -05:00
adelikat
99d70a1c7f
SNES - super scope support
2017-04-20 19:50:58 -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
37c989c661
more misc code cleanups, with some C#6isms
2017-04-10 11:24:53 -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
145dd8d1c3
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-03-15 18:02:46 -05:00
feos
a9cda4a21f
tastudio: dynamically resize usertext column
2017-03-15 21:46:46 +03:00
feos
6e99227c72
tastudio: Clone() for branches. fixes UserText cancellation
...
also cancel backup and osd message if text edit was canceled
2017-03-15 19:17:47 +03: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
d254ad01d8
tastudio: add branch undo feature
...
the fact that it's separated from changelog is because there's no way to extend the latter, but *also* it's intended, as we want branches to be independent from changelog manipulations
todo: figure out branch text edits
2017-03-14 22:49:55 +03:00
feos
114274ac4d
tastudio: latch autohold state for every manual movie length extension
...
finally fixes #534
2017-03-12 19:43:23 +03:00
feos
64665f0e82
tastudio: use LatchSticky() when adding new frames
...
fixes autohold behavior, making it operate like it did before banning user input latch in replay mode
now in replay mode all input is ignored except for autohold, which is set via tastudio gui
2017-03-12 17:28:54 +03:00
feos
a30b89039f
more topmost modal dialogs
2017-03-12 14:50:24 +03:00
zeromus
5488eadb89
work on #816
2017-03-08 15:57:00 -06:00
Sappharad
df2a6c8154
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/MainForm.cs
2017-02-21 20:02:00 -06:00