ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,306 Commits 95 Branches 91 Tags 2.5 GiB
Commit Graph

24 Commits

Author SHA1 Message Date
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
nattthebear ebe789eed2 heh 2017-05-10 07:45:23 -04: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 868c02175c some more topmosts and sound mutes 2017-03-14 22:13:51 +03:00
feos a30b89039f more topmost modal dialogs 2017-03-12 14:50:24 +03:00
Sappharad 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
feos ae16703ffc tastudio makers text popup: 
- appears when double-clicking existing marker in tasview
- appears at cursor position when called from tasview (fancy)

this required adding optional position to ShowHawkDialog()
 2017-01-19 23:24:41 +03:00
Sappharad 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
zeromus 53eae133e7 fix #537 Annoyance with "always on top" 2015-11-12 17:32:49 -06:00
Sappharad 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
jdpurcell c81bb3e50e Little cleanup (extension method for BeginInvoke). 2015-01-04 18:22:17 +00:00
adelikat 31823693ae Cheats, Ram Watch - Fix bugs in column hide/show in new system 2015-01-01 01:21:06 +00:00
adelikat dba923d8b9 Cheats - auto-generate the Columns submenu instead of boilerplate 2014-12-31 23:48:39 +00:00
adelikat ace8192c8a Cheats dialog - refactor and simplify how column info is saved and loaded 2014-12-31 23:28:50 +00:00
adelikat 3e80e59f2d TAStudio - rip out uneeded stuff 2014-08-23 16:00:56 +00:00
adelikat 982d134cd2 More stuff for input roll and other tinkerings in preparation for obsoleting TasView 2014-08-23 14:30:12 +00:00
adelikat 7ec866ced5 add some extensions to the ControlExtension class for converting cruddy .NET 1.0 collection objects to IEnumerable<T>, and start removing some code in specific forms that work around cruddy .NET 1.0 stuff 2014-07-28 03:01:57 +00:00
adelikat 5d4ff76ed6 Convert a copy/pasted method in a bunch of tool dialogs to an extension method 2014-07-28 02:31:51 +00:00
adelikat c988466942 Convert some more toolhelper methods to extensions 2014-07-28 02:10:31 +00:00
adelikat 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
adelikat 216796c29e Remove enum helper and move the remaining method to ReflectionExtensions since that is more accurate to what it is doing 2014-07-03 17:41:55 +00:00
adelikat 00ac231a2a More extension reorg 2014-07-03 17:29:01 +00:00
adelikat 393057d33a Convert a helper method into an extension method 2014-07-03 17:01:10 +00:00
adelikat bf2ba0841a make recent n64 plugin UI logic I added be more clever 2014-05-14 22:04:47 +00:00