Sappharad
|
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 |
|
adelikat
|
078dc4ddb1
|
misc cleanups in remaining config files
|
2017-05-31 10:28:06 -05:00 |
|
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 |
|
J.D. Purcell
|
1946db8791
|
Whitespace, to reduce difference with master.
|
2017-05-02 23:12:37 -04: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
|
8c1eaf25ff
|
system for more thorough tooltips in hotkey and controller config dialogs (so, for instance, the function of a key can be described)
|
2014-11-07 16:58:27 +00:00 |
|
zeromus
|
6428b07d0a
|
make input binding limitless (instead of limited to 4). at the same time, fix bugs caused by index accounting related to the limit.
|
2014-10-11 08:43:26 +00:00 |
|
adelikat
|
a2829f8d9a
|
Input Widget - if assigning a button with autotab on, if the button is not the same as the first position value, clear all bindings first. Makes for a less confusing user experience when remapping joypad buttons
|
2014-06-21 20:02:31 +00:00 |
|
adelikat
|
500bbaf3c1
|
Controller Config - add a Clear button
|
2014-06-04 15:00:53 +00:00 |
|
adelikat
|
bcf2924a23
|
InputWidget - make highlight color a bit darker because it is hard to see on Windows 8, thanks Microsoft
|
2014-05-11 20:29:08 +00:00 |
|
adelikat
|
48365516c0
|
Input Widget - restore tooltip functionality that got deleted at some point
|
2014-05-05 21:43:46 +00:00 |
|
zeromus
|
e6a979bfd3
|
escape can now be bound through the special bindings dropdown menu
|
2014-04-22 19:47:02 +00:00 |
|
zeromus
|
bb98f7d5b0
|
fix new bugs in hotkey/input binding process
|
2014-04-22 19:23:52 +00:00 |
|
zeromus
|
c7e37753bf
|
Instead of InputWidget, use new InputCompositeWidget UserControl which includes a button you can use to summon a contextmenu of special bindings (such as WMouse L), which the textbox part (still InputWidget) will ignore otherwise.
|
2014-04-19 21:03:49 +00:00 |
|
adelikat
|
2c0804eede
|
Input config - when autotab is off, fix bug where pressing esc was not updating the textbox, also some formatting cleanup
|
2014-02-08 16:15:07 +00:00 |
|
adelikat
|
ad39eb36f4
|
Input Widget - use SysColors.Window when exiting the widget, not SysColors.Control, also clean up some code in that file while I'm at it
|
2013-11-27 23:52:21 +00:00 |
|
adelikat
|
c669680e07
|
Rename Multiclient folder
|
2013-11-03 04:05:56 +00:00 |