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
ebe789eed2
heh
2017-05-10 07:45:23 -04:00
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
28da1e215f
misc code formatting improvements in random files in EmuHawk
2017-04-17 15:23:31 -05:00
b53502eed8
Spaces -> tabs.
2017-04-15 16:37:30 -04:00
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
117e0b07e7
Pass the core instance to the record movie dialog
2016-12-04 12:51:48 -06:00
604ed74ff9
remove some usages of VideoProviderGlue by checking for VideoProvider availability before doing some dependent processes
2016-12-04 10:30:51 -06:00
3cf4d3464d
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/tools/TraceLogger.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2016-08-23 21:21:57 -05:00
35a07f42eb
subtitles:
...
- trim trailing spaces
- sort by frame and then by Y pos (to properly order multiline subs)
- concat multilines (optionally) on export
- option to skip color tag on export
todo: fix multiline ordering for export
2016-06-29 00:32:43 +03:00
2e4720cae9
Merged branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.Common/BizHawk.Client.Common.csproj
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
BizHawk.Common/InstanceDll.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
vbanext/instance.cpp
2016-05-03 21:51:47 -05:00
66683b16ed
replace "Ok" with "OK"
2016-03-26 21:50:33 -05:00
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
d7186c9e6f
remove c#6isms
2016-01-21 21:22:26 -06:00
2f11a3adca
Updated brace alignment
2016-01-15 19:16:35 -08:00
7949e2e182
Added Directory.Exists check for Movie director when clicking the browse button
2016-01-15 19:14:59 -08:00
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
1e2f4e12be
Watch refactoring
...
Some improvement when you get Available types. Used to return a new
array each time you call the function. It has been transformed into an
IEnumrable and yield return.
DisplayType, PreviousType and Watchsize have been moved outside the
Watch Class
2015-11-28 22:52:00 +01:00
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
a283b2d1b9
fix threading bug in movie scanner
2015-08-05 16:37:17 -05:00
4d03920726
- Fixed Movie playback on OS X. (File sharing violation)
2015-07-26 20:49:31 -05:00
39bc6cbb8b
Added native file save dialogs on OS X.
2015-07-26 20:14:18 -05:00
490adc905e
Support recording movies that start from SaveRam, note: as of this changeset tastudio does not support this concept and may interact in weird ways with saveram-anchored movies
2015-07-26 15:41:22 -04:00
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
a660aa3c57
EditSubtitlesForm - Revert changes from r7614 caused by WinForms designer not running at 96 DPI.
2015-02-08 14:23:44 +00:00
82fcd0bc5e
refactor IVideoProvider into a service. uses in mainform and friends are still hacky
2015-01-14 22:37:37 +00:00
e2033c9d2e
AsStatable() and also update statusbar saveslots on CloseRom()
2014-12-05 00:52:16 +00:00
bdccb6d400
Record Movie - remove the "Now" option if the core doesn't implement IStatable
2014-11-30 17:37:22 +00:00
76148ae111
Break off savestate functionality from IEmulator into IStatable and refactor things accordingly. Still todo (a big todo): EmuHawk should gracefully handle a core that is not an IStatable by disabling functionality dependent upon it (Savestates, Rewind, Tastudio, etc)
2014-11-30 16:42:58 +00:00
ff54192fdc
fix missing movie extension for game names that have a . at Length-4
2014-11-30 04:02:31 +00:00
829ee72914
Tastudio - make comment editor always in edit mode, make it modeless, add a save button
2014-11-02 15:20:17 +00:00
b10ef0b1a4
EditCommentsForm - some code and whitespace cleanup
2014-11-02 15:07:19 +00:00
daf74eb91b
framebuffer in movie anchor states
2014-10-27 01:14:47 +00:00
b4d065869e
EditSubtitlesForm: Added rows now have default values.
2014-10-19 22:42:46 +00:00
33eb056221
Fix record movie dialog defaulting to tasproj after tastudio is opened
2014-10-18 21:08:05 +00:00
62e01f08c9
fix replay dialog "stop at frame" field to allow 10 digits instead of 3
2014-09-29 04:42:12 +00:00
8c68fe6d83
Play movie - stop on frame textbox - change max length from 3 to 8
2014-08-31 01:46:43 +00:00
0f1ead706b
Refactored srt exporting to have less logic client side and implemented color.
2014-08-17 11:36:37 +00:00
6ba7212f43
Added "Export to SubRip" button to the subtitle edit dialog.
2014-08-16 23:40:33 +00:00
3880c45398
Fixing Recording from "now", for the 500th time
2014-08-16 15:01:53 +00:00
95e7c534f6
Play movie - turbo option for the stop on frame feature
2014-07-27 17:56:00 +00:00
0397ea1ff4
Remove the CustomControls/Util file and move all the classes into the Form Extensions file, since they were all extension methods for window form objects
2014-07-27 15:22:30 +00:00
3fbbfde343
Play Movie dialog - add a Last frame option to the stop feature, to stop on the last frame of the movie
2014-07-26 13:30:24 +00:00
f8fcc23184
Play Movie - stop on Frame option implemented
2014-07-26 13:06:19 +00:00
ee93e988bc
a small and pointless code refactor in the record movie dialog
2014-07-21 18:14:27 +00:00
cb3e340a1a
Movie stuff
2014-07-08 15:15:35 +00:00
7e39e67b1f
tastudio - more fixes to startup logic, still convolted, buggy and wrong, but better!
2014-07-08 13:46:59 +00:00
893a8b16e5
Record Dialog - Fix crash when movie folder does not already exist
2014-06-29 20:07:21 +00:00
6fce0bcad6
remove Time from IMovie and instead implement the logic in PlatformFrameRates
2014-06-29 00:57:33 +00:00
055e88fea3
Remove Fps from IMovie
2014-06-29 00:48:36 +00:00
Sappharad