Commit Graph

56 Commits

Author SHA1 Message Date
John Peterson 94d8eb5d4e InputCommon and nJoy: Moved more functions to InputCommon
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2150 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 15:05:03 +00:00
John Peterson c6b4f5c819 InputCommon and nJoy: Moved functions to InputCommon, to be shared with the Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2147 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 14:34:23 +00:00
John Peterson 60e89dfc6f nJoy: Fixed bug that would cause the settings to be lost when nJoy was started without any detected gamepad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2131 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 05:57:28 +00:00
John Peterson 2b8d2134e5 nJoy: Slight oversight in last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2088 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 10:25:45 +00:00
John Peterson fcb951c0c9 nJoy: Made the out of focus option only apply to gamepad input. As I understand it it's primarily used to allow keyboard input at the same time as Dolphin is used. Then it would probably be annoying to send the keyboard input to Dolphin while you are typing. Keyboard inputs was also the main idea with the out of focus option, I think that it's not as important for gamepad input as you are less likely to use the gamepad in two different programs simultaneously.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2087 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 10:17:01 +00:00
LPFaint99 f999ae94df Make checking for focus optional for njoy input.
So if one wants, on one monitor play Dolphin, and on the other use the keyboard for something else

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2082 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 06:21:22 +00:00
John Peterson eb91942fd6 nJoy: Fixed bugs in settings saving and loading
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2069 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-02 03:16:59 +00:00
John Peterson 8c9d07b26b nJoy: Don't allow input when Dolphin is not in focus (supports both the
rendering to main window and render to separate window options)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2062 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-01 16:29:35 +00:00
John Peterson c9ca6ef55a nJoy: Fixed a bug that would sometimes cause settings to not be saved correctly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2010 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-25 18:20:16 +00:00
nakeee 2e92b94e4a Compile fix on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2005 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 22:24:44 +00:00
John Peterson 0db67cf51c nJoy: Small change
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2004 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 22:17:51 +00:00
John Peterson a3c383ad4a nJoy: Made it tolerate a bad device (the Wiimote DirectInput device for example)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2003 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 22:13:53 +00:00
omegadox 8f98f0b778 Some warning and code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1998 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 00:45:46 +00:00
John Peterson e4c96ece51 nJoy: Non-windows build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1982 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 19:53:16 +00:00
John Peterson 7f9dc55fbc nJoy: Improvements to the configuration, the SaveById option should now be simpler and better
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1977 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-21 18:09:31 +00:00
tmator 8f2d1136a7 fix njoy build for non win32 os, and small osx64 build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1965 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 20:21:05 +00:00
John Peterson 140ba01794 nJoy: Fixed configuration bug
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1957 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:41:58 +00:00
John Peterson 85a53457de nJoy: Forgot the header file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1956 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:32:15 +00:00
John Peterson 1386ad69ff nJoy: Comment change
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1955 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:28:45 +00:00
John Peterson a10c603255 nJoy: Fixed the 360 pad triggers with XInput, now they are separate triggers that work just like they should
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1953 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:25:33 +00:00
nakeee 8c997e90d9 Empty kills the string:(
Using IsEmpty()


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1951 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:58:31 +00:00
nakeee 68cfd3618e opss
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1950 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:53:15 +00:00
nakeee 6730645dd8 Small compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1949 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:44:32 +00:00
nakeee af89d9e511 and today we'll learn about why not to cast pointer to int....
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1947 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 10:41:05 +00:00
John Peterson 969f34bbd0 nJoy: Escape key stops waiting for input when configuring the pad, changed the display of a disabled button from -1 to ""
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1946 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 10:37:48 +00:00
John Peterson 6f4cbb89f9 nJoy: Configuration bugfixes, and show the digital shoulder button status in the advanced settings to
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1945 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 06:38:29 +00:00
John Peterson 00bca8d807 nJoy: Fixed the analog shoulder buttons for the XBox 360 pad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1944 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 05:28:30 +00:00
John Peterson bede48c6b1 nJoy: Fix halfpress button configuration
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1943 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 23:17:29 +00:00
John Peterson 8f40075f8f nJoy: Fixed the analog trigger buttons
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1934 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 17:47:00 +00:00
John Peterson 4a88f31ddb nJoy: Preparation for fixing the digital pad and the analog triggers
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1928 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 05:49:25 +00:00
Shawn Hoffman ba8c2aa7e4 nakee's work on dolphin events. Also get wxw out of logmanager. This commit wants your comments
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1875 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-15 06:48:15 +00:00
John Peterson 6517f80316 nJoy: Config fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1791 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-05 06:35:59 +00:00
John Peterson eb2ce16a6c Interface and general: Fixed the hangings and crashes that would occur from repeated Start and Stop, added optional toolbar themes, made the fullscreen mode in the OpenGL plugin more user friendly for Windows users
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1770 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 21:53:41 +00:00
John Peterson 9786786c7e nJoy: Typo
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1708 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 20:11:22 +00:00
John Peterson 5e5e507121 nJoy: Enabled keyboard input (only for buttons so far) through wxWidgets in the main application. It only works when you render to the main window.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1706 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 18:50:24 +00:00
John Peterson b63e559f8a nJoy: I forgot a file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1699 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-27 11:41:58 +00:00
John Peterson 15cff48f5a nJoy: First implementation of an analog stick radius adjustment. Converting a square radius to a circle radius.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1698 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-27 11:32:03 +00:00
John Peterson a9e588f4f3 nJoy: I forgot the file header
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1666 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-26 02:48:35 +00:00
John Peterson 92cef41968 nJoy: Preparation for adding new options. NOTICE: Not tested in OSX
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1665 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-26 02:42:15 +00:00
Shawn Hoffman 4a5d9ded94 namespace-ified ActionReplay, and made ISOProperties use the existing AR code. bonus: encrypted arcodes are saved as unencrypted codes just by closing the isoproperties dialog. also added ARCodeAddEdit, but once again, it only views entries atm. some misc wxw cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1560 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-17 04:14:24 +00:00
bushing 901fe7c00f set svn:eol-style=native for Plugins/**.cpp
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1441 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-08 05:25:12 +00:00
bushing 30c883bcfc set svn:eol-style=native for **.h
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1438 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-08 04:46:09 +00:00
Shawn Hoffman 6e4673d5e7 most lame update ever, falcon4ever really wanted this to be changed, blame him
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@792 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-07 22:45:48 +00:00
Shawn Hoffman 26552968b7 updated njoy so it now shows it's beautiful aboutbox too.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@790 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-07 19:29:30 +00:00
Shawn Hoffman b39f0240cb padsimple config should get keycodes in windows now. replaced wxT("") with wxEmptyString.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@676 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-24 22:20:37 +00:00
Maarten ter Huurne bbeca155de Added "const" to the data type. This fixes loads of compile warnings and the resulting file seems to still be a valid XPM (in fact, some of the files already had "const").
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@349 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:24:16 +00:00
Maarten ter Huurne 8876637c9f Fixed invalid use of sprintf.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@344 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 09:54:11 +00:00
Laurence Muller 5fc50dc63c Disabled the rumblepad hack.
If you want to use it, uncomment #define USE_RUMBLE_DINPUT_HACK in nJoy.h.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@172 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-10 18:46:55 +00:00
Laurence Muller 8f1628b69c nJoy: GUI fixes
- It should now look pretty in Linux
- wxWindow::Update(); does not seem to work in Linux, so no countdown timer in Linux when pressing a button.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@110 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-30 23:33:37 +00:00
Laurence Muller fb7a7f9001 nJoy: GUI fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@108 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-30 22:17:45 +00:00