Commit Graph

119 Commits

Author SHA1 Message Date
hrydgard 70bc8167f8 Warp back to 1983!!! (rev 1983, that is, not the year :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1997 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 21:28:55 +00:00
John Peterson 7ecf884f9a nJoy: Fix to last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1996 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 16:50:07 +00:00
John Peterson f15c53eba7 nJoy: Compile fix (missing #endif)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1995 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 16:48:04 +00:00
John Peterson 361aed6811 nJoy: Added #ifdef INPUTCOMMON
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1994 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 13:31:00 +00:00
John Peterson 63ad74f9e8 nJoy and PluginManager:
1. Avoided LoadLibrary() and FreeLibrary() in favor of using an existing LoadLibrary() because of an unresolved crash related to LoadLibrary() and nJoy. After several times of LoadLibrary() and FreeLibrary() of nJoy these seems to be some kind of memory corruption that brings up several error boxes from different places (not just nJoy) and then cause a crash.

2. Slowed down the moving of the pad initialization to InputCommon. I'm not against InputCommon at all, but I have to spend some more time with it before it works on Windows

3. Partly fixed a somewhat frequent failure of nJoy with SDL 1.3 that would give a strange DirectInput error message and cause the pads to not function. It's still present before the nJoy config windows is opened. It's only fixed on booting a game.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1991 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 10:00:59 +00:00
nakeee 8a87001778 forgot include
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1986 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 00:15:57 +00:00
nakeee 87bfe821eb Added input manager handles the sdl init/quit for now
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1984 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 22:32:57 +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 e332e18ce6 nJoy and SerialInterface: Fixed the crashes with MAXPADS more than 1, the downside is that it doesn't work well one the second boot
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1980 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 11:18:46 +00:00
John Peterson bb06dfb823 nJoy and SerialInterface: Fixed the nJoy crashes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1978 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 00:31:12 +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 4f0298df1b nJoy: Added ifdefs for the XInput files
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1954 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:26:56 +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
John Peterson 0c9a1a9595 nJoy: The triggers were inversed
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1948 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:11:02 +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
Shawn Hoffman 05a5333c80 fix build and change /EHsc to /EHa. jakestine (pcsx2-playground) says it is the Right Thing To Do.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1942 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 23:01:17 +00:00
John Peterson c2c6e2bd47 nJoy: Fixed some misplaced values
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1935 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 18:09:03 +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
nakeee bf18502077 ADding functions
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1828 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-08 12:12:15 +00:00
XTra.KrazzY bfe43d0c61 Various NOWX fixes thanks to tinctorius, please verify this!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1797 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-05 22:11:08 +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
nakeee 232fe74536 warning fix by olejl
We should get rid of that wxmessagebox...



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1731 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-01 15:38:46 +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 270e411cf5 nJoy: Changed comment
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1707 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 18:56:10 +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
nakeee 20b6438b4b warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1703 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 15:49:19 +00:00
nakeee 847dc93b73 That line doesn't make sense at all
Can anyone explain why it's there?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1702 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 15:37:14 +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
LPFaint99 fb5b4d026a Compile fix, remove PanicAlert from nJoy SDL
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1697 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-26 19:39:12 +00:00
nakeee a679e345fd Started working on pad evnt
fix for testgl
fix for njoy-sdl to work in debug


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1674 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-26 09:20:01 +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
bushing fd60a51a95 Fix the degenerate case so that we don't crash if zero joypads are detected
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1645 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-24 07:38:39 +00:00
Shawn Hoffman a6a279a7da fix for issue 411, njoy testing is re-enabled in windows, but not for debug config (it hates logging?)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1573 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-18 01:21:56 +00:00
nakeee 62d44c9166 Clear errors, fixed unload on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1566 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-17 17:49:38 +00:00