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
1946db8791
Whitespace, to reduce difference with master.
2017-05-02 23:12:37 -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
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
868c02175c
some more topmosts and sound mutes
2017-03-14 22:13:51 +03:00
849498dfa6
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/Program.cs
2016-06-21 20:48:49 -05:00
559eacf95a
InputpPompt: allow multiline info
...
bk2 export for tastudio: stop endlessly appending extensions
tasstudio autosave:
- fix interval init on load
- 0 interval disables autosave
- canceling SaveAs doesn't kill the timer
- ability to append "backup" to filename allows saving to a separate file
-- don't let tasproject switch to the backup file (bit hacky)
2016-06-10 16:05:12 +03:00
a14c5ad11b
Merge branch 'master' into mono-portable
2015-07-25 22:52:28 -05:00
4b669662b4
InputPromt: Signed and Unsigned behavior was backwards.
...
TAStudio: -Handle wheel scroll speed when changing orientation.
-Save wheel scroll speed setting.
-DrawInput setting was not being properly loaded.
2015-07-25 03:20:16 -05: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
aeea08a823
Cleanup the InputPrompt class, removing unused methods, and converting some silly methods into properties allowing some pretty array initializers instead of function calls
2014-07-28 02:40:30 +00:00
8c064875c2
TAStudio - ability to add markers, very crude implementation for now
2014-07-15 23:43:17 +00:00
1964f3754a
Merge InputValidate into StringExtensions
2014-07-03 16:00:57 +00:00
d5e2808944
Fix namespaces
2014-07-03 14:56:13 +00:00
f714093b23
Movies 2.0 - some progress towards supporting floats
2014-02-25 02:56:32 +00:00
3dfcd8b22a
drastically cleanup the InputValidate class
2014-02-03 19:37:43 +00:00
c669680e07
Rename Multiclient folder
2013-11-03 04:05:56 +00:00
Sappharad