Commit Graph

49 Commits

Author SHA1 Message Date
XTra.KrazzY 8a6fcdc2bc Cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3549 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-06-26 15:06:23 +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
nakeee 9ec81d4bf0 linux compile fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2377 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 21:37:36 +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
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 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 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 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 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
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 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 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 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
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 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 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
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 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 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 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 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 7f8cc4ec62 more nowx fixes
disabled njoy test build


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-14 23:52:01 +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
Laurence Muller 54719af08c removed win32 gui from the plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@783 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-05 23:04:35 +00:00
fires.gc c7ae1fd402 Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 17:26:12 +00:00
Sonicadvance1 9a3ebd0c3b Linux: Compiling with nowx=true now builds the entire project without WX, this isn't tested in Windows so it's always on via Common.h, You can test/fix it yourself that way. Also fixed Compiling again
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@762 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 07:57:28 +00:00
daco65 7a68316c61 stupid VS2005 compiler and its " i dont understand directories with spaces"
fixed building when the source is located at a place like C:\Documents and settings


also got sick of njoy.h saying the new lines wern't done correctly. so thats fixed too.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@504 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 23:55:59 +00:00
Maarten ter Huurne 838f37112e Fixed compilation on Mac OS X by testing for Linux explicitly instead of assuming that non-Windows equals Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@380 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 08:49:34 +00:00
Sonicadvance1 3e029639df Removed jpeg dependency in GL plugin, added Rumble to Linux nJoy. and reverted my accidental Dolphin ini file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@379 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-29 09:55:17 +00:00
Maarten ter Huurne 734586a0ab Include system headers using "#include <file.h>", so GCC will not issue warnings about them.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@331 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 23:32:54 +00:00
Maarten ter Huurne efd894fe1e Include SDL header as "SDL.h". This works with the CFLAGS output of pkg-config, picking up SDL no matter where it is installed.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@274 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 21:19:56 +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 bcaa0d1d86 nJoy:
- Added some kind of rumble support (windows only, using direct input).
- Only usable for player one.
- Not customizable, fixed rumble strength.
- Due to some Dolphin bugs you need to initialize rumble support manually.

How to use:
- Disable the 'render to main window' in the video plugin (opengl or d3d).
- Start the game and wait a few seconds.
- When the game is running, press the 'half press' button once.
- Rumble support should now be enabled (if your joypad supports it).
- Confirmed to work with Crazy Taxi.

Dolphin bug:
When void PAD_Initialize(SPADInitialize _PADInitialize) is called, the render window does not excist yet. Therefor the value _PADInitialize.hWnd is incorrect.

In order to initalize rumble support, it is required to set the CooperativeLevel to "DISCL_EXCLUSIVE | DISCL_FOREGROUND". But without a proper hWnd this will fail.
So the trick I used here is, let the game start and create a window (and a hWnd). After that I set the CooperativeLevel.



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@126 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-01 23:38:53 +00:00
Laurence Muller 53ba40fd7f nJoy: GUI update
- Config GUI now uses wxWidgets (should work in linux!)
- The alignment of text may look crappy in linux, so we still need to fix that.
- Opening the config GUI takes time, crappy XPM image of the controller loads slow (cant we use BMP files???) (line 240)
- Stupid GUI bug present when switching between a default joystick and one with no hat. (line 381)
- For some reason setting the value of a wxTextCtrl doesnt gets updated immediately (line 559)
- If you're using windows and dont want to use wxWidgets for the GUI, you can still use the old one by removing #define USE_WXWIDGETS from nJoy.h line 33.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@95 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-29 22:26:42 +00:00
Laurence Muller 82137a0ee9 nJoy:
- Converting dialog windows to use wxWidgets instead of win32.
- Currently only the about box is converted.
- The debug versions in windows will not compile yet.
- If you want to use the old version, remove #define USE_WXWIDGETS in nJoy.h



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@85 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-26 12:28:17 +00:00
Laurence Muller 690b7d4e1e nJoy:
- nothing special, just a default nJoy.ini.
- Controller 1 contains a profile for the logitech rumblepad 2

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@71 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 19:23:36 +00:00
Laurence Muller d8ed24fd29 nJoy:
- This version should compile on linux.
- The about and config dialogs are disabled (win32 should be replaced by wxWidgets)
- This version is untested, so if you want to try it out, use a premade nJoy.ini from a windows install.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@70 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 18:53:54 +00:00
Laurence Muller f9582bef30 nJoy:
- Enabled Half press for shoulder buttons
- Added a option to select controller type
- Normal controllers should use the default joystick
- Some joysticks dont have a real hat (POV) but fake this with buttons.
In this case Joystick (no hat) should be selected.
After this is selected, four new buttons will appear for the d-pad.
- Next version will probably include keyboard support.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@60 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 00:49:20 +00:00
fires.gc e8b40c07a3 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@51 8ced0084-cf51-0410-be5f-012b33b47a6e 2008-07-22 09:02:26 +00:00