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
6bc542cc56
tastudio: fix _columnDown being drawn without moving
...
used to happen when you click the column header with rows selected
2017-05-29 20:37:27 +03:00
19dde8018a
InputRoll cleanups
2017-05-24 11:45:57 -05:00
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
b53502eed8
Spaces -> tabs.
2017-04-15 16:37:30 -04:00
ed3bf0e62b
Fix mixed line endings.
2017-04-15 15:53:02 -04:00
b2a28339d1
Use 'nameof' operator.
2017-04-10 08:36:42 -04:00
a786f73154
Fix some places using 'int' instead of IntPtr. ( #828 )
2017-04-08 18:36:29 -04: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
0ec0910207
tastudio: move screenshot popup to yet another control to allow fading
...
avoid false branch 0 hover when entering branch view from the top
todo: hide screenshot when moving upwards to header cell
2017-03-08 16:31:49 +03:00
df2a6c8154
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/MainForm.cs
2017-02-21 20:02:00 -06:00
885a57d91e
tastudio: it's never enough, fix #800 (row count cap)
2017-02-15 19:54:45 +03:00
25fd0fdb9a
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
BizHawk.Client.EmuHawk/MainForm.cs
BizHawk.Client.EmuHawk/tools/GameShark.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2017-01-31 21:59:37 -06:00
17faf42b6e
tastudio: try to be a bit smarter with SelectedIndexChanged
...
forces SetSplicer() calls, but only at InputRoll's OnMouseDown, the rest is handled by tastudio
2017-01-19 21:55:18 +03: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
433d4ad693
tastudio: revive ColumnsChangedCallback, and alarm if it dies again
2016-11-17 21:30:42 +03:00
2a9bd175d8
tastudio: kill zombie denoteStatesWithBGColor and co. in InputRoll, having them in Settings is enough
2016-11-17 20:25:06 +03:00
36dcf53cc0
on specialized number boxes, select all text when reseting an empty box to a default value. This fixes #685
2016-11-09 10:19:49 -06:00
bb1a3e3221
PrereqsAlert - give a little more vertical space to the general advice box so the user can see the final message (that we will keep nagging them)
2016-11-07 12:20:54 -06:00
07a1709dbb
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/tools/GameShark.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
2016-10-18 18:23:07 -05:00
b3d91049de
Change PrereqsAlert.Designer.cs to point to GitHub instead of SF
2016-09-27 18:06:54 -07:00
3d88f77ec6
Fixed TAStudio crash when deselecting "Show Player X". The horizontal scrollbar was not updated which caused an exception when scrolling to the right.
2016-09-25 16:55:34 -06:00
4834e31bb8
Fixed bug with InputRoll selected rows drawing hidden columns.
2016-09-25 14:04:57 -06:00
d66181a597
Fixed bug with right click inputRoll selction.
2016-09-25 12:47:37 -06:00
7d1084bf98
tastudio: change internals of editing input during scrolling.
...
for now it only makes a single edit per click, since we only recalculate OnMouseDown if scrolling. this is required to get rid of scrolling recursion caused by various actions.
also ClearLeftMouseStates before saving dialog pops up
2016-09-08 22:22:33 +03:00
ba895e3bad
tastudio:
...
- fix recursion in cell updates caused by clicking cursor column (fixes scrolling)
- display invalidated color consistently
n64: fix trace callback prototype
2016-09-04 12:03:12 +03: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
b4a9123515
tastudio: fix editing while unpaused + left button held scenario.
...
now it replicates taseditor:
- editing input while unpaused, if autorestore is off, resumes emulation and ignores seek frame. if you keep holding the LMB, and follow cursor is on, it will keep scrolling, drawing and emulating
- editing input while unpaused, if autoresotre is on, fires autorestore and then just pauses on the seek frame
what's different from taseditor:
- with autorestore and follow cursor on, if you hold the button, and seek frame is below the view, it will keep scrolling down, drawing new input and emulating. taseditor does *not* follow cursor while seeking.
this all doesn't necessarily make sense, but we need people to figure out what is best for work.
2016-07-11 21:39:32 +03:00
f23767ae6a
tastudio: properly set input while unpaused
...
replicates taseditor behavior: if autorestore is off, emulation resumes running, otherwise it pauses on it.
todo: fix this during left button held
2016-07-10 22:25:02 +03:00
849498dfa6
Merge branch 'master' into mono-portable
...
Conflicts:
BizHawk.Client.EmuHawk/Program.cs
2016-06-21 20:48:49 -05:00
53c7f4e5be
tastudio: ignore inputroll hotkeys and numeric branch hotkeys during float editing mode.
2016-05-07 15:05:07 +03:00
a7f03d4c2c
make direct3d9 prereq check non-fatal and make d3d display method initialization fail non-fatal, falling back to gdi+
2016-05-05 09:01:01 -05: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
dc18535b88
tastudio: use VisibleRows instead of SeekingCutoffInterval.
...
allow SelectedIndexChanged again, just not use it in tasview. can we comment out in designers like that?
2016-04-17 21:02:21 +03:00
f5746a7b8f
tastudio: stop updating splicer after every new cell is appended.
...
quick fix to #597 .
fix crash when pasting input beyond movie length. todo: make input log append like PasteInsert does.
2016-04-17 13:52:58 +03:00
a18648dc45
GDIRenderer: add a method to create NormalFont using the LOGFONT features.
...
InputRoll: make the font match what fceux uses. padding still works oddly though.
2016-04-17 11:47:18 +03:00
5a6ffe022a
fix tastudio font bugs, some mine, some not mine
2016-04-17 03:07:07 -05:00
1bde0c5a72
GDIRenderer - fix bugs in using any font but the old default gdi font (i.e. System) while rendering to offscreen bitmaps (e.g. tastudio)
2016-04-16 17:13:49 -05:00
2fafd85064
InputRoll: stop switching to RotatedFont when we're in vertical orientation.
...
Still doesn't care about the font we set, since it's never created in gdirenderer.
2016-04-16 21:46:47 +03:00
6b013d6d94
fix VirtualListView (incl. movie open dialog) on x64
2016-04-07 15:25:14 -05:00
4e13f205d4
update and clarify prereqsalert urls and guidance
2016-03-21 21:08:09 -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
e0d74c7718
better error handling in shader compiling. kind of sloppy, but gets the job done. entire system could use a little rethinking, if i ever revisit filters
2016-02-03 02:28:03 -06:00
d39aa6433e
tastudio: implement SeekingCutoffInterval
2016-01-27 16:18:20 +03:00
192458a190
try catching some missing prereqs in emuhawk startup and print a report about it
2016-01-14 01:50:41 -06:00
ac1c7d0992
HexView - setting up some API
2015-12-24 15:46:57 -05:00
60692450e8
New Hex Editor - add the plumbing for the HexView widget, that will use the GDIRenderer as the basis for the drawing.
2015-12-24 11:15:29 -05:00
Sappharad