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
..
GamePad.cs	Small improvement to previous commit.	2017-04-08 12:40:31 -04:00
GamePad360.cs	Spaces -> tabs.	2017-04-15 16:37:30 -04:00
IPCKeyInput.cs	fix error in IPCKeyInput	2015-08-14 19:10:55 -05:00
Input.cs	Merge branch 'master' into mono-portable	2017-05-02 20:38:56 -05:00
Keyboard.cs	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
OTK_GamePad.cs	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
OTK_Keyboard.cs	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