Commit Graph

23 Commits

Author SHA1 Message Date
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
J.D. Purcell 1096e1bc5a Small improvement to previous commit. 2017-04-08 12:40:31 -04:00
J.D. Purcell a2aba7e3c2 Make sure DirectInput objects are disposed properly. Also includes a better fix for thread safety issues (#722). 2017-04-08 11:49:04 -04:00
Sappharad 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
zeromus 144f08cfc3 fix xinput > 2 devices, and change how xinput devices are numbered in configuration (by player number and not index-of-connected-xinput-device-plus-one) 2016-03-21 01:01:36 -07: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 35066b69ef tastudio - fix behaviour of menu by special hacks involving ALT key 2015-12-05 11:32:56 -06:00
Sappharad 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
Sappharad f3534cd584 Game controller support on OS X. Tested against a 360 controller, and a PS4 controller. Both work, although it seems that OpenTK rotates the Dpad of the PS4 controller by 45 degrees so it doesn't map very well. 2015-10-06 22:53:13 -05:00
zeromus c99cc7fa2a fix #484 2015-08-31 14:50:26 -05:00
zeromus aa8b87129b add IPCKeyInput, since we chose to use dinput for keys, so people can send input to the process somehow. way easier and safer than changing to use win32 keystroke messages 2015-08-14 18:07:19 -05: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
zeromus 48360f77be 2014-06-23 01:20:17 +00:00
zeromus 140aec6a4d add system for controlling which forms can generate mouse input 2014-06-22 23:20:36 +00:00
goyuken c87abe9503 fix analog axis names for xinput controllers 2014-05-16 14:43:56 +00:00
zeromus b4db548e94 remove lame console spam 2014-04-27 01:20:53 +00:00
zeromus c5027b1df6 fix new bug with modifier keys being sticky in the binding dialogs 2014-04-22 20:26:55 +00:00
zeromus 39ec2ebc90 use buffered mode for keyboard input, so that it is impossible for quick keystrokes to get missed. also increase priority of input thread. 2014-04-20 03:38:03 +00:00
goyuken 47b1e3ae49 I AM MASTER OVER DOG 2014-04-16 02:11:22 +00:00
goyuken 9730d06a46 preliminary moose support 2014-04-16 01:47:37 +00:00
adelikat 7b03fc0bc0 Move Buffer.cs and Util.cs from BizHawk.Emulation to BizHawk.Common, and add 1234832983 usings 2013-11-04 00:36:15 +00:00
adelikat 589758f74d rename GlobalWinF to GlobalWin, yeah, I'm being nitpicky 2013-11-03 16:07:58 +00:00
adelikat c669680e07 Rename Multiclient folder 2013-11-03 04:05:56 +00:00