Commit graph

95 commits

Author SHA1 Message Date
sl1nk3.s
664f017fec Fix a hang on stop on linux (why is that done better on linux ?? strange :P)
Fix what must have been a typo for Pikmin PAL CRC, the game still doesn't work though :(
Fix a crash on stop in nJoy 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3821 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-17 16:20:55 +00:00
Nolan Check
d85f5a6937 Rearrange LogManager includes. The main purpose is to make it possible to modify Thread.h without recompiling the whole entire project.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3770 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-12 21:58:32 +00:00
Shawn Hoffman
2a236a4631 remove PAD_GetAttachedPads() from PadSimple and nJoy (and plugin specs). It hasn't done anything except get in the way/cause confusion since changing SI devices was added. Also I declare PadSimpleEvent and nJoy .4 as dead/rotting code. someone can feel free to prove me wrong...but know they are on my hitlist :p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3739 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-11 00:27:32 +00:00
John Peterson
45dbfc7fdc nJoy: (Forgot to disable logging)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3723 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 08:00:21 +00:00
John Peterson
8d42378479 nJoy: Allow the same settings for the C-stick
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3722 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 07:58:36 +00:00
John Peterson
a718ff266e nJoy: Fixed the radius adjustment
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3717 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 02:23:40 +00:00
John Peterson
8fa315879a nJoy: Added radius option to advanced settings
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3716 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 00:48:07 +00:00
Shawn Hoffman
518d3854ba add wxw modalness to both njoys and fix a bug where calling DllConfig from different parent HWNDs would stop the config dialog from appearing.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3656 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-03 03:01:58 +00:00
sl1nk3.s
b0852c1bef Updated rumble for nJoy, fixed a few glitches with half press button and deadzones too.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2840 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-02 21:13:58 +00:00
Shawn Hoffman
2301d072a6 nakee's new logmanager. added a console window for windows builds (prints to parent console on non-win32). also fix some random wxw bugs: main window's position is saved when using debugger, disabling windows from the tools menu are saved settings, some other small fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2675 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-18 17:17:58 +00:00
Marcus Wanners
c0cf641779 Linux compile fix.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2559 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-05 15:58:14 +00:00
Marcus Wanners
432ea89b49 Compiler Warnings: Mismatch edition. Also fixed some conversion warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2557 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-05 15:16:50 +00:00
John Peterson
fc6a7c47d5 Core Stop and Start: Fixed stop and start again by avoiding FreeLibrary() of the OpenGL plugin, and avoiding a crash in its ShutDown() function. You need to use SETUP_FREE_PLUGIN_ON_BOOT to compile with this option that works on my system. Also, I noticed that I don't need the SETUP_AVOID_CHILD_WINDOW_RENDERING_HANG anymore, I can now delete the g_EmuThread without having it hanging in its waiting function.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2356 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 04:24:53 +00:00
John Peterson
0b1909aed0 Rerecording and nJoy: Copied the recording functions to nJoy
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2305 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-18 23:26:16 +00:00
tmator
b5c0efd5ac fix nowx njoy
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2292 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-17 22:05:34 +00:00
John Peterson
eb1c6163f7 Emulated Wiimote: Enabled the roll and pitch function again (I had accidently disabled it in the last commit)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2220 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-12 10:49:38 +00:00
John Peterson
b932a53b68 Emulated Wiimote: Fixed the angles to x, y, z values conversion. There's just one thing left to fix before the combined roll and pitch works, when roll is more than 90 pitch has to be changed from for example 15 to -165 or something like that. Until I figure that out you can use the emulated roll and pitch separately by setting the range of either one of them to zero.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2219 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-12 08:46:48 +00:00
John Peterson
0681f76a1d Last commit: Forgot one change
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2216 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-11 10:31:43 +00:00
John Peterson
68f39cb287 nJoy:
1. Circumvent the IDirectInputDevice2::SetDataFormat() error when opening the configuration window to.

2. Fixed the Allow out of focus input option again

3. Allow changing of the mapped pads while a game is running

4. Prevented crashes or problems from any combination of having the configuration window open when a game is started or stopped

5. Fixed a crash that would occur after nJoy was started with a connected pad, then stopped, and all pads disconnected, then started again

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2215 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-11 10:30:02 +00:00
nakeee
4d57101e29 Fix crazy svn changing trunk on last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2206 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 14:02:01 +00:00
nakeee
3e9b3b266a [Soap] Roll back inputcommon changes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2203 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 12:40:06 +00:00
John Peterson
1fbebb4ce1 Wiimote: Configure gamepad in Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2172 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 13:10:29 +00:00
John Peterson
2757dbe2a8 InputCommon and Wiimote: Detect pads in the Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2151 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 15:39:28 +00:00
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
e926bc61d1 Wiimote: Added logging messages for the speaker configuration and for the 0x18 sound reports, the speaker currently produce a low humming noise in the wpad tools demo, but no real sound
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2141 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 10:15:55 +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
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
2199b15ca6 nJoy: Updated IsFocus() to allow config window input to
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2068 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-01 20:45:27 +00:00
John Peterson
2620257f47 nJoy: Fixed the digital L and R buttons
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2066 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-01 20:19:21 +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
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
John Peterson
fa7e857161 nJoy: Readded some fixes to nJoy (Notice: these changes have nothing to do with the argument earlier. These are only for fixing nJoy (point one and three in the 1991 revision)). Now opening the Wiimote plugin doesn't crash either (it was just a typo in GetWiimote()).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2000 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 12:09:30 +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
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
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
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
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
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